Commit Graph

1517 Commits

Author SHA1 Message Date
400a463286 Fix APKs with SDK versions being reference values
This non-standard behavior is rare, but quite annoying.
The solution is simple - replacing the reference value with the actual value from integers.xml, just like Apktool already does for versionName.
2019-02-20 08:26:17 -05:00
49e55f522f Fix APKs with SDK versions being reference values
This non-standard behavior is rare, but quite annoying.
The solution is simple - replacing the reference value with the actual value from integers.xml, just like Apktool already does for versionName.
2019-02-20 08:26:14 -05:00
be1aea76fe Fix reference values not being resolved against frameworks
This Apktool issue has existed for a long time and is especially prevalent with ROMs with multiple frameworks.
The issue happens because Apktool treats reference values inside XMLs (like layouts) as raw text values, and doesn't resolve them during decompile time. This causes some values to be misformed, but more importantly, this causes values referencing to secondary frameworks to not be resolved with their source frameworks, which also means the framework ID won't be added to usesFramework.ids in apktool.yml, and that breaks recompiling.
The interesting thing is that reference values are actually being resolved when they are located in value resources, like styles, thus presenting an inconsistent behavior.
This simple mod eliminates the "rawValue" for reference values, and that forces the "value" (resource ID) to resolve against the respective frameworks, fixing misformed values in the process.

BEFORE:
I: Using Apktool 2.4.0-896569-SNAPSHOT on Notes.apk
I: Loading resource table...
I: Decoding Shared Library (miui), pkgId: 16
I: Decoding Shared Library (miui.system), pkgId: 18
I: Decoding AndroidManifest.xml with resources...
I: Loading resource table from file: bin\framework\1.apk
I: Regular manifest package...
I: Decoding file-resources...
I: Loading resource table from file: bin\framework\16.apk
I: Decoding Shared Library (androidhwext), pkgId: 15
I: Decoding values */* XMLs...
I: Baksmaling classes.dex...
I: Copying assets and libs...
I: Copying unknown files...
I: Copying original files...

Some comparisons before and after the fix:
https://i.imgur.com/2gTllT0.png
https://i.imgur.com/KzJUeQt.png

AFTER:
I: Using Apktool 2.4.0-896569-SNAPSHOT on Notes.apk
I: Loading resource table...
I: Decoding Shared Library (miui), pkgId: 16
I: Decoding Shared Library (miui.system), pkgId: 18
I: Decoding AndroidManifest.xml with resources...
I: Loading resource table from file: bin\framework\1.apk
I: Regular manifest package...
I: Decoding file-resources...
I: Loading resource table from file: bin\framework\16.apk
I: Decoding Shared Library (androidhwext), pkgId: 15
I: Loading resource table from file: bin\framework\18.apk
I: Decoding Shared Library (miui), pkgId: 16
I: Decoding Shared Library (android.miui), pkgId: 17
I: Decoding values */* XMLs...
I: Baksmaling classes.dex...
I: Copying assets and libs...
I: Copying unknown files...
I: Copying original files...
2019-02-18 06:47:09 -05:00
1a61e44632 Merge pull request #2015 from iBotPeaches/issue-1522
Add horizontal/vertical line support if missing for 9patch
2019-02-18 06:42:47 -05:00
bc7302a52b test: assert that vertical/horizontal divs are added if missing 2019-02-17 13:07:32 -05:00
1e68bb0ede feat: Fill missing 9patch lines to fix recompile
Somehow Google manages to compile MiuiSystemUI.apk (and a few other APKs I encountered) with a misformed pip_dismiss_scrim.9.png.
Either way, every time I encountered such 9.patch images, the missing lines always indicated a single full div or padding.
Apktool already fills missing padding lines, now it can also fill missing divs.
2019-02-16 18:52:34 -05:00
0efccc2d93 feat: allow configurable api-level for smali 2019-02-16 18:43:25 -05:00
438c4b9c59 build: windows is not an optional failure 2019-02-16 18:01:38 -05:00
91f6c80cc6 fix: add new aapt builds for mac 2019-02-16 18:01:38 -05:00
a9b5f7b41d fix: add new unix builds for master aosp aapt 2019-02-16 18:01:38 -05:00
2c41ac1f7f build: also patch the clean-tests for not completed win builds 2019-02-16 18:01:38 -05:00
443e5d3643 build: fix timeout in windows due to travis
- refs: https://travis-ci.community/t/windows-build-hangs-after-done-exit-0/1439
2019-02-16 18:01:38 -05:00
37e700424a build: update jdk on windows from 191 to 201 2019-02-16 18:01:38 -05:00
b0f22918cc fix: win builds off master branch of AOSP 2019-02-16 18:01:38 -05:00
2253b66e50 fix: rebuild windows binaries to fix linking issue 2019-02-16 18:01:38 -05:00
43c3b9644c Merge pull request #2000 from vbarthel-fr/issue-1994
fix: issue 1994
2019-01-30 10:04:58 -05:00
13e356f2ef fix: use the res type spec name to create res bag value
Starting with the version 28.0.3 of the Android SDK build tools,
the internal ids of the items of an array bag seems to have changed.

Because of those changes, array resources were no longer decoded correctly.
They were decoded as style resources.

Instead of using the id of the first item within a resource bag,
the name of the res type spec is now used to choose the correct
resource bag value to create.

Note: a list of "legal names" for resource types  can be found in the source code of aapt2.
2019-01-29 10:07:40 +01:00
72368fc0d4 bug: reproduce the bug were array resources are decoded as style bag 2019-01-29 10:06:32 +01:00
896569a822 Merge pull request #1998 from iBotPeaches/issue-1997
fix: add headless call in beginning of execution
2019-01-25 15:52:57 -05:00
6d1792a98d fix: add headless call in beginning of execution
- fixes: #1997
2019-01-25 15:42:07 -05:00
29355f876d Merge pull request #1980 from iBotPeaches/windows
Windows Support for Travis
2019-01-09 18:10:53 -05:00
e79d3fa977 fix: use "shell" for windows 2019-01-09 17:54:21 -05:00
d3f88b20dc fix: allow windows to fail for now 2019-01-09 17:44:29 -05:00
cfea3e0831 build: initial attempt at getting travis windows support
build: force windows onto the bash environment

build: update permission (+x) of clean-test file

build: "bat" instead of "exe" extension

build: attempt to support long-path names on windows

build: another attempt at long filepaths on windows

build: force +x on scripts prior to execution

build: exit with return code of last command

build: dump out current path

build: dump out current path - part 2

fix: remove 5 chars from path to drop down from 260 windows max path

build: correct gradlew.bat path and remove unneeded lines

fix: remove long path global configuration

fix: restore PATH setting for windows env

build: PATH resets between scripts, fix for windows
2019-01-09 17:43:40 -05:00
d7f9be9200 Merge pull request #1977 from sebras/master
Adapt AXMLResourceParser to handle broken headers.
2019-01-09 17:40:01 -05:00
016dc25fa9 Merge branch 'master' into master 2019-01-09 17:18:19 -05:00
a09822ef7b Merge pull request #1973 from iBotPeaches/issue-1952
XSD file support for both aapt1/aapt2
2019-01-09 17:17:31 -05:00
45152c269a refactor: use specific exceptions when decoding raw xml 2019-01-09 17:11:51 -05:00
c1f50a2810 style: remove unused LOGGER for PullStreamDecoder 2019-01-09 17:11:32 -05:00
6bb73b509d fix: throw specific errors during XMLPullParser error 2019-01-09 17:10:56 -05:00
ac3518e098 feat: add new exception types 2019-01-09 17:10:21 -05:00
b01dce7f3a Adapt AXMLResourceParser to handle broken headers.
Fixes #1976.
2019-01-08 21:20:50 +01:00
c833a32a6e style: syntax changes for review 2019-01-04 18:05:51 -05:00
39faff0a21 test: allow aapt2 xsd test to run 2019-01-04 18:00:33 -05:00
7cd8946849 fix: fallback to raw decoder if xml decoder failed
- prevents injection of false value
2019-01-04 18:00:19 -05:00
a5cfe41a8f test: add test for aapt1/aapt2
- ignore aapt2 due to failure
2019-01-04 17:45:51 -05:00
af4a506567 fix: add aapt1/aapt2 xsd file 2019-01-04 17:45:36 -05:00
261e163bc9 Merge pull request #1960 from iBotPeaches/android-9.0.0_r22
Sync aapt binaries with aapt1/aapt2 + no-crunch
2019-01-04 11:34:37 -05:00
61848cfa06 fix: allow AaptManager to find new naming of aapt binaries 2019-01-04 11:24:49 -05:00
ec0d58fbad feat: add 32/64bit binaries for aapt1/aapt2 2019-01-04 11:24:28 -05:00
f997e0aff1 fix: patch out bools on ResBooleans, as they must be empty
- refs: #1918
2019-01-03 16:57:23 -05:00
0dfa6c4656 test: add test to ensure empty ids.xml are generated for aapt1/aapt2 2019-01-03 16:56:25 -05:00
127192e07d build: add new patched aapt1 version for mac 2018-12-18 18:19:24 -05:00
d831fc92be docs: handle new location of 64bit binaries 2018-12-18 18:19:09 -05:00
bec8778d7a tests: update platformBuild* values to inherit from AndroidManifest 2018-12-18 18:07:40 -05:00
618de55bd3 fix: update AaptManager to handle flattened aapt structure 2018-12-18 17:37:04 -05:00
b0a7e64615 refactor: flatten directory structure of aapt binaries by 1 directory 2018-12-18 17:36:34 -05:00
e603463489 docs: minor spelling error for "Twitter" 2018-12-18 17:26:38 -05:00
25f0bc085e docs: add note about switching to r22 from r3 (9.0.0) 2018-12-18 17:01:29 -05:00
e82537e340 Merge branch 'no-crunch-aapt-option' of https://github.com/Novex/Apktool 2018-12-18 16:24:27 -05:00