Connor Tumbleson
bc7302a52b
test: assert that vertical/horizontal divs are added if missing
2019-02-17 13:07:32 -05:00
IgorEisberg
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
IgorEisberg
0efccc2d93
feat: allow configurable api-level for smali
2019-02-16 18:43:25 -05:00
Connor Tumbleson
91f6c80cc6
fix: add new aapt builds for mac
2019-02-16 18:01:38 -05:00
Connor Tumbleson
a9b5f7b41d
fix: add new unix builds for master aosp aapt
2019-02-16 18:01:38 -05:00
Connor Tumbleson
b0f22918cc
fix: win builds off master branch of AOSP
2019-02-16 18:01:38 -05:00
Connor Tumbleson
2253b66e50
fix: rebuild windows binaries to fix linking issue
2019-02-16 18:01:38 -05:00
Vincent Barthelemy
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
Vincent Barthelemy
72368fc0d4
bug: reproduce the bug were array resources are decoded as style bag
2019-01-29 10:06:32 +01:00
Connor Tumbleson
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
Connor Tumbleson
016dc25fa9
Merge branch 'master' into master
2019-01-09 17:18:19 -05:00
Connor Tumbleson
45152c269a
refactor: use specific exceptions when decoding raw xml
2019-01-09 17:11:51 -05:00
Connor Tumbleson
c1f50a2810
style: remove unused LOGGER for PullStreamDecoder
2019-01-09 17:11:32 -05:00
Connor Tumbleson
6bb73b509d
fix: throw specific errors during XMLPullParser error
2019-01-09 17:10:56 -05:00
Connor Tumbleson
ac3518e098
feat: add new exception types
2019-01-09 17:10:21 -05:00
Sebastian Rasmussen
b01dce7f3a
Adapt AXMLResourceParser to handle broken headers.
...
Fixes #1976 .
2019-01-08 21:20:50 +01:00
Connor Tumbleson
c833a32a6e
style: syntax changes for review
2019-01-04 18:05:51 -05:00
Connor Tumbleson
39faff0a21
test: allow aapt2 xsd test to run
2019-01-04 18:00:33 -05:00
Connor Tumbleson
7cd8946849
fix: fallback to raw decoder if xml decoder failed
...
- prevents injection of false value
2019-01-04 18:00:19 -05:00
Connor Tumbleson
a5cfe41a8f
test: add test for aapt1/aapt2
...
- ignore aapt2 due to failure
2019-01-04 17:45:51 -05:00
Connor Tumbleson
af4a506567
fix: add aapt1/aapt2 xsd file
2019-01-04 17:45:36 -05:00
Connor Tumbleson
ec0d58fbad
feat: add 32/64bit binaries for aapt1/aapt2
2019-01-04 11:24:28 -05:00
Connor Tumbleson
f997e0aff1
fix: patch out bools on ResBooleans, as they must be empty
...
- refs: #1918
2019-01-03 16:57:23 -05:00
Connor Tumbleson
0dfa6c4656
test: add test to ensure empty ids.xml are generated for aapt1/aapt2
2019-01-03 16:56:25 -05:00
Connor Tumbleson
127192e07d
build: add new patched aapt1 version for mac
2018-12-18 18:19:24 -05:00
Connor Tumbleson
bec8778d7a
tests: update platformBuild* values to inherit from AndroidManifest
2018-12-18 18:07:40 -05:00
Connor Tumbleson
b0a7e64615
refactor: flatten directory structure of aapt binaries by 1 directory
2018-12-18 17:36:34 -05:00
Connor Tumbleson
e82537e340
Merge branch 'no-crunch-aapt-option' of https://github.com/Novex/Apktool
2018-12-18 16:24:27 -05:00
a-bahmani
db553ebe8d
Fix null pointer
...
When I am decompiling an apk, I got this exception:
Exception in thread "main" java.lang.NullPointerException
at brut.androlib.res.data.ResResSpec.<init>(ResResSpec.java:42)
2018-12-17 23:42:28 +03:30
Connor Tumbleson
83f5b21574
fix: use striped symbols build of aapt.exe
2018-09-05 19:31:07 -04:00
Connor Tumbleson
e752ebf8ff
build: update aapt1/2 builds for darwin
2018-09-02 10:01:33 -04:00
Connor Tumbleson
859b7c6d3f
test: updates aapt2 tests to handle the new "compileSdk" attributes
2018-09-02 09:55:49 -04:00
Connor Tumbleson
da133f482f
build: add aapt2 for win/unix
2018-09-02 09:55:36 -04:00
Connor Tumbleson
7a481f68e0
test: updates aapt1 tests to handle the new "compileSdk" attributes
2018-09-02 09:39:07 -04:00
Connor Tumbleson
b49bba19e4
test: don't enforce attribute order or compare attributes that don't exist
2018-09-02 09:37:59 -04:00
Connor Tumbleson
846d6a783a
build: add win/unix aapt1 builds
...
- refs: https://github.com/iBotPeaches/platform_frameworks_base/commits/apktool_9.0.0
2018-09-02 09:37:37 -04:00
Connor Tumbleson
3f85dfa6c9
fix: revert change that enforced "STRINGPOOL_TYPE" on StringPool
...
- fixes : #1876
2018-08-23 17:14:38 -04:00
Connor Tumbleson
b7d33cb623
style: update license headers that are missing 2018
2018-08-23 16:14:24 -04:00
Connor Tumbleson
aa0047c76c
feat: update internal freamwork to API 28 (Android Pie Final)
2018-08-07 20:52:44 -04:00
Seb Patane
b0fd764df4
feat: Expose the aapt --no-crunch option
...
- Add a --no-crunch/-nc flag to apktool which gets passed through to aapt
- This allows apktool to make a byte-for-byte copy of resource files
- refs: #1232
2018-07-24 13:54:37 +10:00
Connor Tumbleson
abdd536a18
test: add aapt1/aapt2 tests for "0byte" files
2018-07-20 15:21:44 -04:00
Connor Tumbleson
4bda4674f9
test: use correct "new" variable for tests
2018-07-20 15:20:39 -04:00
Alexei Khlebnikov
564b285126
fix: add file extension to doNotCompress only if the file size is not 0
2018-07-19 18:14:48 +02:00
Connor Tumbleson
eecfc18c82
fix: add another example aapt1 version string
2018-07-02 11:37:55 -04:00
Connor Tumbleson
985f8bb42f
feat: add new win/unix aapt2 build
2018-06-17 08:45:25 -04:00
Connor Tumbleson
925c6c0481
feat: add new mac os x aapt2 build
2018-06-14 16:36:19 -04:00
Connor Tumbleson
39ab6b636b
test: add "$" leading resource test
2018-06-14 16:30:16 -04:00
Connor Tumbleson
06aa8db942
test: navigation resource test added
2018-06-12 08:22:10 -04:00
Connor Tumbleson
016fc51491
fix: add new win/unix aapt2 binaries
2018-06-12 07:10:51 -04:00
Connor Tumbleson
5eee6d2e48
fix: update aapt2 mac binary for new aosp build
2018-06-11 15:10:57 -04:00
Connor Tumbleson
5c79f4228b
fix: revert the new aapt1 build. aapt1 builds are frozen
2018-05-11 13:31:08 -04:00
Connor Tumbleson
e6788f2cb4
fix: add new aapt1/aapt2 mac os x binaries
2018-05-03 15:46:05 -04:00
Connor Tumbleson
3879b90f76
test: add test for various aapt2 version strings
2018-04-19 17:10:10 -04:00
Connor Tumbleson
ba9b532283
test: add a test to confirm that mp3 file is stored (not compressed)
2018-04-12 12:00:38 -04:00
Connor Tumbleson
061ddb8ee6
fix: remove hardcoded list of no-compressed assets
...
- We no longer use aapt for building assets, so this code is never ran
in aapt1/2. So we can no longer skip these assets.
2018-04-12 11:45:29 -04:00
Connor Tumbleson
6554881606
Revert "options: deprecate "doNotCompress", introduce "noCompressAssets""
...
This reverts commit cb6b6dfda8
.
2018-04-06 14:59:10 -04:00
Connor Tumbleson
d755724ed8
Revert "decode: only store full relative path to uncompressed assets"
...
This reverts commit bd9c9c7cec
.
2018-04-06 14:59:03 -04:00
Connor Tumbleson
a073bad32d
Revert "tests: update test to use new "noCompressAssets" property"
...
This reverts commit 653472d006
.
2018-04-06 14:58:56 -04:00
Connor Tumbleson
923ae6e9b8
Revert "tests: refactor tests to use assertEquals instead of hacky assertTrue"
...
This reverts commit d6e3d013e7
.
2018-04-06 14:58:48 -04:00
Connor Tumbleson
4d89228686
Revert "decode: store uncompressed assets to new property"
...
This reverts commit 14eedde165
.
2018-04-06 14:58:42 -04:00
Connor Tumbleson
0700c684b6
Revert "build: introduce "buildUnknownAndUncompressedAssets""
...
This reverts commit e35f66b0e0
.
2018-04-06 14:58:35 -04:00
Connor Tumbleson
72196f3544
Revert "fix: normalize paths for uncompressed assets & unknown files"
...
This reverts commit ca25a26944
.
2018-04-06 14:58:11 -04:00
Connor Tumbleson
46ebcb0fab
Revert "fix: don't use deprecated property "doNotCompress""
...
This reverts commit 258fb82fe2
.
2018-04-06 14:57:24 -04:00
Connor Tumbleson
bb42ef068e
Revert "fix: Applications with implicit sdk versioning lose that information"
...
This reverts commit 25a164dd10
.
2018-04-06 14:57:09 -04:00
Connor Tumbleson
db59f93e36
fix: ignore package "FFFFFFFFFFFFFFFFFFFFFF" to prevent wrong renaming
...
- refs: #1752 / #1471
2018-04-06 14:46:39 -04:00
Connor Tumbleson
041659c43f
style: output "built apk" when task is completed
2018-04-06 14:03:42 -04:00
Connor Tumbleson
25a164dd10
fix: Applications with implicit sdk versioning lose that information
...
- This is a temporary hack to keep application building, but will not
work due to missing nearly all resources.
- refs: #1761
2018-04-06 14:02:41 -04:00
Connor Tumbleson
2d190d019c
fix: remove 6 year old experimental smali resource tagger
...
- refs: #244
- Regular expressions are not the way to fix this. Too many situations
in smali where patterns won't work. Correct fix would be to hook dexlib
2018-04-06 12:03:08 -04:00
Connor Tumbleson
258fb82fe2
fix: don't use deprecated property "doNotCompress"
2018-04-06 10:49:08 -04:00
Connor Tumbleson
ca25a26944
fix: normalize paths for uncompressed assets & unknown files
2018-04-06 10:31:28 -04:00
Connor Tumbleson
e35f66b0e0
build: introduce "buildUnknownAndUncompressedAssets"
...
- processes assets that are stored (uncompressed)
- additionally process unknown files
- modifies application after build process
- prevents "too long" execution command
- fixes #1272
2018-04-05 17:07:55 -04:00
Connor Tumbleson
14eedde165
decode: store uncompressed assets to new property
2018-04-05 17:07:55 -04:00
Connor Tumbleson
d6e3d013e7
tests: refactor tests to use assertEquals instead of hacky assertTrue
2018-04-05 17:07:55 -04:00
Connor Tumbleson
653472d006
tests: update test to use new "noCompressAssets" property
2018-04-05 17:07:55 -04:00
Connor Tumbleson
bd9c9c7cec
decode: only store full relative path to uncompressed assets
2018-04-05 17:07:55 -04:00
Connor Tumbleson
cb6b6dfda8
options: deprecate "doNotCompress", introduce "noCompressAssets"
2018-04-05 17:07:55 -04:00
Connor Tumbleson
e679d71615
test: rename all resources towards new location
2018-04-03 07:24:00 -04:00
Connor Tumbleson
de730ff774
test: move all resources outside of brut/apktool folder
2018-04-03 07:23:32 -04:00
Connor Tumbleson
c7ac2c05e2
update internal framework to API P (Android P Preview - x.x)
...
- refs: #1742
2018-03-13 11:05:15 -04:00
Connor Tumbleson
7621fdb79c
Assume Android P will be API 28
...
- refs: #1742
2018-03-12 15:34:32 -04:00
Connor Tumbleson
1713495ea7
aapt2: move test resources to math structure of tests
2018-03-05 11:00:47 -05:00
Connor Tumbleson
a693f316e0
aapt2: add test to confirm pkgId of 0x80
2018-03-05 10:29:58 -05:00
Connor Tumbleson
722870e6b9
aapt2: don't init XMLUnit if not using the full xml diff
2018-03-05 10:29:44 -05:00
Connor Tumbleson
8ae5d529cb
aapt2: patch yml files to have proper forcedPackageId param
2018-03-05 10:29:20 -05:00
Connor Tumbleson
3f8d9fa835
aapt2: patch system for decoding pkgId between 0x7f - 0xff
2018-03-05 10:28:50 -05:00
Connor Tumbleson
448d14592f
aapt2: don't rebuild compile stage unless needed
2018-02-28 18:40:13 -05:00
Connor Tumbleson
646eb54102
aapt2: refactor testsuite
...
- split from aapt1/aapt2 (those that do building)
- tests that just test decode (no aapt) split
- categories for androlib/encdoers/util for various others
2018-02-28 15:11:39 -05:00
Connor Tumbleson
09148902ef
aapt2: start of tests for aapt2
2018-02-28 13:27:13 -05:00
Connor Tumbleson
d2c808dd7d
aapt2: refactor loading of aapt/aapt2 binaries
...
- change: die out if invalid aapt path is provided
2018-02-28 11:25:56 -05:00
Connor Tumbleson
f05bd31e59
aapt2: sparse resource pulling from yaml
2018-02-28 11:05:07 -05:00
Connor Tumbleson
3c84590a1a
aapt2: treat verbose output as fine
2018-02-28 10:58:38 -05:00
Connor Tumbleson
6f45869068
aapt2: update binaries
...
- refs: 595581e599
2018-02-22 11:22:41 -05:00
Connor Tumbleson
dc9d1866a5
test: rewrite test suite to use BaseTest extending
2018-02-22 11:22:41 -05:00
Connor Tumbleson
593b357ed1
support test for lib/libs folder
2018-02-22 11:22:41 -05:00
Connor Tumbleson
828ba8aef3
aapt2: kill off aapt1 testsuite, rebuild from scratch
2018-02-22 11:22:40 -05:00
Connor Tumbleson
200ad0250b
aapt2: add linux/windows binaries
...
- very buggy
2018-02-22 11:22:40 -05:00
Connor Tumbleson
5d95b388aa
aapt2: beginning use of aapt2 vs aapt1 params
2018-02-22 11:22:40 -05:00
Connor Tumbleson
5a8bc45653
aapt2: aapt2 is a staged build (compile and link).
...
- we destroy the "compile" stage item after a link, but keep the pending directory
- apktool then cannot complete link stage
- if aapt2 is used, lie to system and re-process
- todo: rethink this
2018-02-22 11:22:40 -05:00
Connor Tumbleson
a8bdad628a
aapt2: wire up zipPackage() instead of using aapt1 for final apk package
2018-02-22 11:22:40 -05:00
Connor Tumbleson
9e5df69d17
aapt2: remove unneeded newline
2018-02-22 11:22:40 -05:00