Commit Graph

1423 Commits

Author SHA1 Message Date
Connor Tumbleson
76a940628f greedy .dex finder is finding dex files in unknown folders
- which android can't load unless its in /root of apk
2015-10-15 08:57:20 -05:00
Connor Tumbleson
e7c1bcefe8 Merge pull request #1059 from iBotPeaches/smali-submodule
Remove smali project in favor of smali submodule
2015-10-14 13:46:31 -05:00
Connor Tumbleson
92077203d8 have travis use github public URLs
attempt to run tests with default tasks

remove notifications & override install command

add git config setup for travis-ci

set email/name globally on travis-ci

run applyPatches before compileJava

remove incremental java build

add "build fatJar proguard" to script run

applyPatches before running script

Update build.gradle

add wrapper to footer (post cleanup)
2015-10-14 13:34:30 -05:00
Connor Tumbleson
3d8a50fc7d add smali submodule 2015-10-14 07:47:01 -05:00
Connor Tumbleson
ca917cf103 update build.gradle to handle patching smali 2015-10-14 07:42:30 -05:00
Connor Tumbleson
7786ba6fdd add old "brut.apktool.smali" folder to ignore 2015-10-14 07:41:54 -05:00
Connor Tumbleson
65f756d21c add smali patches 2015-10-14 07:39:07 -05:00
Connor Tumbleson
7316a6935b remove smali project in preps for submodule 2015-10-14 06:22:32 -05:00
Connor Tumbleson
5e4bae0526 Only stores extension(s) of uncompressed files
- fixes #1053
2015-10-13 07:28:43 -05:00
Connor Tumbleson
2aca068fee start next dev cycle (2.0.3-SNAPSHOT) 2015-10-12 17:20:42 -05:00
Connor Tumbleson
ee9d44c785 version bump (2.0.2) 2015-10-12 15:12:27 -05:00
Connor Tumbleson
0fb21a3758 update internal aapt to API 23 2015-10-12 06:21:25 -05:00
Connor Tumbleson
b54e40ad21 update internal framework to API 23 (marshmallow) 2015-10-08 06:59:05 -05:00
Connor Tumbleson
26b883ac3b Updated unit-tests to include API 23 tests 2015-10-08 06:58:32 -05:00
Connor Tumbleson
a29839bab2 Added API 23 qualifier "roundness" 2015-10-08 06:58:11 -05:00
Connor Tumbleson
0abaab1173 bump smali to 2.0.8 as per 613c493e9698812c0531acf073bc7ca9e4538eac 2015-09-30 14:29:17 -05:00
Alex Light
89ef73b927 Make smali respect order of implements
Previously smali would reorder implements directives to be
alphabetical in the dex file. In the Java 8 Language the order of
interfaces may affect the order of initializer invocation when using
default methods. Therefore we will preserve this order in
smali/baksmai.

Bug: 24338722

Change-Id: I6851b02a5402c7d4cd4b60af54052c320e48d0bf
2015-09-30 14:18:32 -05:00
Ben Gruver
7a3d09cc47 Add ability to list methods/fields/types when assembling with smali
This can be useful in analyzing why you are going over the 64k
method/field/type limit
2015-09-30 14:17:16 -05:00
Ben Gruver
52fd17a436 Handle invalid debug item offsets more gracefully 2015-09-30 14:16:48 -05:00
Ben Gruver
fd489e990c Add backwards compatible version of DexFileFactory.loadDexFile and Opcodes
Keep the old prototype, so we don't break existing code.
2015-09-30 14:16:29 -05:00
Ben Gruver
008b12f97c Replace a missed usage of Iterators.emptyIterator() 2015-09-30 14:16:15 -05:00
Ben Gruver
5cd9d01a9e Remove usages of the deprecated Iterators.emptyIterator() method 2015-09-30 14:14:05 -05:00
Connor Tumbleson
027e135d41 Merge branch 'phhusson-fix-flag-ref' 2015-09-12 15:07:58 -05:00
Connor Tumbleson
0d53923e24 Merge branch 'fix-flag-ref' of https://github.com/phhusson/Apktool into phhusson-fix-flag-ref 2015-09-12 15:07:49 -05:00
Connor Tumbleson
52dc52c2d3 add failing unit-test for reference in attribute 2015-09-12 15:07:32 -05:00
Connor Tumbleson
22305ccb7c travis ci no longer supports jdk switch on mac hosts 2015-09-12 14:39:51 -05:00
Pierre-Hugues Husson
e7b294a3ea Fix flags being defined as references 2015-09-10 18:07:00 +02:00
Connor Tumbleson
e8ad159438 Some APKs are reporting wrong pkgId
- fallback to renamed package to find that pkgId
2015-08-21 11:01:43 -05:00
Connor Tumbleson
579d7c561e fixes #1021
- adds support for godzillaui
2015-08-15 10:29:24 -05:00
Connor Tumbleson
4219997470 update internal aapt to include various patches
- miui support for godzillaui
 - miui support for 4 digit mnc/mcc
 - no-op the compat functions
2015-08-15 10:20:05 -05:00
Connor Tumbleson
5c6f325c06 Merge pull request #1020 from agrieve/stored-entries
Adds doNotCompress list to apktool.yml
2015-08-15 09:11:26 -05:00
Andrew Grieve
392420c909 Adds doNotCompress list to apktool.yml
This is the list of files (resources, assets, etc) that are stored in
the .apk uncompressed.

For apps that use AssetFileDescriptor.openFd(), the adding compression
will break the call.

Maintains support for the resourcesAreCompressed key, but no longer
records it when decompiling (it instead records resources.arsc in the
doNotCompress list).
2015-08-14 11:52:33 -04:00
Connor Tumbleson
2033e305af Prevent reading resources when -r / --no-res is used 2015-08-11 13:47:10 -05:00
Connor Tumbleson
099cc0fcb3 fixes #1005
- handles apks that have .9.xml files
2015-08-03 08:45:30 -05:00
Connor Tumbleson
f49335ab99 start next dev cycle (2.0.2-SNAPSHOT) 2015-07-15 17:08:05 -05:00
Connor Tumbleson
f5c6925943 version bump (2.0.1) 2015-07-15 16:17:05 -05:00
Connor Tumbleson
59c5316d94 Merge pull request #991 from mmastrac/master
Propagate the raw int values to callers
2015-07-14 08:51:37 -05:00
Matt Mastracci
4249dde7cc Propagate the raw int values to callers 2015-07-07 15:39:22 -06:00
Connor Tumbleson
d5f3b3fd5a [skip] its com.miui.core now 2015-06-29 11:33:13 -05:00
Connor Tumbleson
b878cbd776 [miui] add a new ignored package 2015-06-06 10:43:48 -05:00
Ben Gruver
0370416d90 Add the generated accessorTest to source control
Some java compilers don't generate the synthetic accessor methods in the
way that the accessorTest is trying to test. So we build the test dex
file using a known-good compiler and check it in, ensuring the test is
always run using an appropriate dex file.

Conflicts:
	brut.apktool.smali/dexlib2/build.gradle
2015-05-23 19:43:56 -05:00
Connor Tumbleson
6ee029dd30 Read extra data if over known bytes
If the ResConfig had a size over KNOWN_CONFIG_BYTES
then the remaining bytes would be read twice, thus breaking
the next config. Fixes #924
2015-05-22 09:07:15 -05:00
Connor Tumbleson
2c1226fab8 [skip] use append instead of concat 2015-05-22 08:47:51 -05:00
Connor Tumbleson
8254764c6c More robust ResFileValue detection
Previously in 4882396163, strings that
resembled a filepath (ie res/foo/file), would be assigned to a
ResFileValue, which when attempted to be casted to ResScalarValue would
error out.

Attempting to check the filesystem for such files, slowed apktool's
execution majorly. In order to prevent this, the ClassCastException
and other checks related to checking ResFileValue when type is string
was added.

This allows bogus strings such as (res/foo/file) to be added, but the
exception is caught and allows decoding to continues. Fixes #921.
2015-05-14 13:27:22 -05:00
Connor Tumbleson
9cb3df85d8 Catch attr lookup on internal attributes
Internal attributes will fail the AttrDecoder. Catch the errors
and simply return the undecoded value which will be correct. Fixes #913
2015-05-10 07:36:44 -05:00
Connor Tumbleson
48285bde03 Prevent frameworks from modifying sharedLibrary
Since all frameworks are decoded the same via readPackage(), reading
a framework that was a sharedLibrary would throw the sharedLibrary
flag for the apk. Since packageName isn't set until after the first
decode, we check the values to make sure we only set this variable on
the first apk decoded. Refs #936
2015-05-05 07:43:48 -05:00
Connor Tumbleson
1fb87e3e4c Post smali 2.0.6 cleanup
- fix smaliDecoder/AccessorTest to use new DexFileFactory params
 - remove unneeded ds/tree files
 - cleanup unmerged lines
2015-05-02 06:59:36 -05:00
Ben Gruver
4cc5f07fd2 Bump the version number to 2.0.6
Conflicts:
	build.gradle
2015-05-01 10:53:51 -05:00
Ben Gruver
91a47123bf Ensure the stream is closed in DexFileFactory.loadDexFile 2015-05-01 10:53:08 -05:00
Ben Gruver
f803a08711 Upgrade to proguard 5.2.1
Conflicts:
	build.gradle
2015-05-01 10:52:58 -05:00