Commit Graph

1624 Commits

Author SHA1 Message Date
Peter Retzlaff
d6f38e38cd Only attempt to use -e option when the packaged aapt binary is used. 2019-11-20 06:46:06 -05:00
Peter Retzlaff
5d488e5f22 Create file containing the do-not-compress extensions and pass it to aapt. 2019-11-20 06:46:06 -05:00
Connor Tumbleson
11ea666c13
Merge branch 'master' of github.com:iBotPeaches/Apktool 2019-11-19 06:55:46 -05:00
Connor Tumbleson
aedee6052f
Merge branch 'realityJie-fix/uncompressed_files_bug' 2019-11-19 06:55:41 -05:00
Connor Tumbleson
b02b265ae2
style: cleanup syntax 2019-11-19 06:55:27 -05:00
Connor Tumbleson
7910802648
Merge branch 'fix/uncompressed_files_bug' of https://github.com/realityJie/Apktool into realityJie-fix/uncompressed_files_bug 2019-11-19 06:53:00 -05:00
Connor Tumbleson
c1f9afe33c fix: enhance bitness detection on windows 2019-11-19 06:45:07 -05:00
Connor Tumbleson
f076def4c5
docs: update internal information for building aapt 2019-11-18 19:59:51 -05:00
Connor Tumbleson
37505ff509 build: update aapt/aapt2 binaries to 71b16b59 (mac) 2019-11-18 19:48:33 -05:00
Connor Tumbleson
9e75e593a6 build: update aapt/aapt2 binaries to 71b16b59 (windows) 2019-11-18 19:48:33 -05:00
Connor Tumbleson
557b763c1c build: update aapt/aapt2 binaries to 71b16b59 (unix) 2019-11-18 19:48:33 -05:00
Connor Tumbleson
661f929c77
docs: no 32bit for mac 2019-11-17 14:21:20 -05:00
Connor Tumbleson
fdbc604209
docs: update internal aapt/aapt2 build instructions 2019-11-17 14:16:59 -05:00
huangweijie
17ad91da61 fix bug of Unrecognized option: --only-main-classes 2019-11-15 08:47:22 -05:00
Brian Pak
31a23ba493 Fix AXML parser to handle obfuscated attribute names
This adds an additional check if the attribute namespace belongs to
Android namespace, and if so we try to decode using attribute decoder.

Fixes #1576.
2019-11-14 18:37:25 -05:00
Connor Tumbleson
31f25bc561
build: update jdk8 to 231 from 221 2019-11-14 08:15:56 -05:00
huangweijie
5197e21d75 there files should not be compressed:
1.base on AOSP's frameworks/base/tools/aapt/Package.cpp: NO_COMPRESS_PATTERN = Pattern.compile("(jpg|jpeg|png|gif|wav|mp2|mp3|ogg|aac|mpg|mpeg|mid|midi|smf|jet|rtttl|imy|xmf|mp4|" +
            "m4a|m4v|3gp|3gpp|3g2|3gpp2|amr|awb|wma|wmv|webm|mkv)$"); specifically this rule include 9patch files.
2.file has not ext
3.the compressive type is store

warning:
even if there are the same type of files, they are compressive type may different, just like this example:
-rw----     1.0 fat     8343 b-  0% stor 80-Jan-01 08:00 assets/resources/assets/effect/common/ctp_trail15_1_tex.unity3d
-rw----     1.0 fat    11526 b-  0% stor 80-Jan-01 08:00 assets/resources/assets/effect/common/ctp_trail15_tex.unity3d
-rw----     2.0 fat     2483 bl 19% defN 80-Jan-01 08:00 assets/resources/assets/effect/common/cw_310300_cylq_ql01_mat.unity3d
-rw----     2.0 fat     9467 bl 17% defN 80-Jan-01 08:00 assets/resources/assets/effect/common/cw_310300_cylq_ql03_fbx.unity3d
ctp_trail15_1_tex.unity3d and ctp_trail15_tex.unity3d are uncompressed, but cw_310300_cylq_ql01_mat.unity3d and cw_310300_cylq_ql03_fbx.unity3d are compressed.

That is why I modified recordUncompressedFiles Method.
2019-11-14 12:02:49 +08:00
Connor Tumbleson
6d2878cca1
Merge pull request #2199 from IgorEisberg/master
build: update to smali/baksmali 2.3.4
2019-10-20 14:38:26 -04:00
IgorEisberg
a33141646b Fix JDK 11 build 2019-10-20 21:23:30 +03:00
IgorEisberg
232e801e4d build: update to smali/baksmali 2.3.4 2019-10-18 04:03:53 +03:00
Connor Tumbleson
197d468727
Merge pull request #2175 from danielmalmq/master
Fixes issue with decoding apk containing a zero byte 9patch
2019-10-06 05:24:04 -04:00
Connor Tumbleson
03c1de4800
Merge pull request #2182 from JingYeoh/bugfix/arsc/multipackage
bugfix, fix get wrong package ResPackage for multi-pkg resources.arsc.
2019-10-06 05:22:00 -04:00
yangjing.yeoh
9e39755750 bugfix, fix get wrong package ResPackage for multi-pkg resources.arsc. 2019-09-23 18:39:18 +08:00
Daniel Malmqvist
dc312a5336 Fixes issue with decoding apk containing a zero byte 9patch 2019-09-19 13:34:06 +02:00
Connor Tumbleson
2264e61a51
Merge pull request #2159 from friederbluemle/update-gradle-wrapper
Update Gradle wrapper to 5.6.2
2019-09-09 16:55:12 -04:00
Frieder Bluemle
7f1d73e7f0
Update Gradle wrapper to 5.6.2 2019-09-05 15:32:54 -07:00
Connor Tumbleson
683fef32ac
Merge pull request #2153 from iBotPeaches/issue-2071
Update to smali/baksmali v2.3.0
2019-08-17 11:33:55 -04:00
Connor Tumbleson
d2bfa79a24
build: update jdk8 to 221 from 211 2019-08-17 10:32:44 -04:00
Connor Tumbleson
fefc5e226a
refactor: use MultiDexContainer instead of DexBackedDexFile 2019-08-17 07:00:15 -04:00
Connor Tumbleson
945ce9b3d4
build: update to smali/baksmali 2.3.0 2019-08-17 06:59:54 -04:00
Connor Tumbleson
75e4c61a1a
Merge pull request #2138 from friederbluemle/update-gradle-wrapper
Update Gradle wrapper to 5.5.1
2019-07-30 17:54:49 -05:00
Frieder Bluemle
e498ad887a
Update Gradle wrapper to 5.5.1 2019-07-22 12:06:15 -07:00
Connor Tumbleson
c2065995ed
feat: update internal framework to API 29 (Q Beta 4)
- fixes: #2131
2019-07-20 12:32:14 -04:00
Connor Tumbleson
f58e043c67
Merge pull request #2072 from iBotPeaches/issue-2058
Prevent directory traversal on asset decoding
2019-07-20 11:10:31 -04:00
Connor Tumbleson
4aa933b31a
test: ensure we don't allow path traversal with win 2019-07-18 07:42:34 -04:00
Connor Tumbleson
47854ec757
fix: experimental fix to prevent path traversal with copied folders 2019-07-18 07:42:34 -04:00
Connor Tumbleson
5aa3cf9728
build: add SECURITY.md 2019-07-14 08:09:21 -04:00
Connor Tumbleson
2c8ea97899
Merge pull request #2132 from iBotPeaches/danielmalmq-master
Added new option to skip non classes[0-9]*.dex files
2019-07-14 07:59:48 -04:00
Connor Tumbleson
9fcd7e4d36
style: grammar for "decompile" vs "disassemble" 2019-07-14 07:35:09 -04:00
Connor Tumbleson
342661cbaa
fix: correct license header on "DuplicateDexTest" 2019-07-14 07:30:41 -04:00
Connor Tumbleson
bae5aab78a
fix: use only long builder for "--only-main-classes" 2019-07-14 07:29:47 -04:00
Connor Tumbleson
9edcc78ee5
style: clean test file 2019-07-14 07:29:32 -04:00
Connor Tumbleson
4d1e6ccbe4
refactor: remove pollution of global command and move to advanced
- removes "-onlymainclasses" for long "--only-main-classes"
2019-07-14 07:23:18 -04:00
Daniel Malmqvist
d79724549c
Added new option to skip non classes[0-9]*.dex files 2019-07-14 07:17:20 -04:00
Connor Tumbleson
5a51c5f96d
style: add comment for explanation of 9patch minimization 2019-07-14 07:09:39 -04:00
Igor Eisberg
bc9f465f3e
Fix the massive list of uncompressed 9.png that prevents recompile on Windows
Windows has its limits, even Windows 10, at least on older versions before the max path length restriction was removed.
Because apktool failed to recognize the .9.png extension as a variety of the .png extension, those .9.png files were piling up in apktool.yml and then passed to aapt, which would fail to run on Windows because of an immense command length.
This fix makes a special exception for the .png exception and will allow the .9.png one to pass as another .png extension.

Before: http://dpaste.com/2BC3RRB
After: http://dpaste.com/177CVZQ
2019-07-14 07:04:49 -04:00
Connor Tumbleson
103aa978df
refactor: remove outdated ALLOWED_PACKAGES constant 2019-07-14 06:56:37 -04:00
Igor Eisberg
8084762274
Fix recompile of miui.apk by allowing package renaming
This old issue prevented the package to be renamed from com.miui.core to miui, making it impossible to recompile, as all attributes are refefred to as miui:*/*. This fixes it permanently.
2019-07-14 06:54:32 -04:00
Connor Tumbleson
3ee39c988a
Merge pull request #2130 from iBotPeaches/issue-2093
License Restoration from 2017 bulk change & 2019 update
2019-07-13 13:25:49 -04:00
Connor Tumbleson
c444bf30f7
build: add exclude for license checks on android.** files 2019-07-13 12:23:48 -04:00