Commit Graph

62 Commits

Author SHA1 Message Date
Connor Tumbleson
d1cea54cc7 [skip] fix proguard warning 2015-04-16 08:24:13 -05:00
Connor Tumbleson
ea38c65e82 beab30089c
- update remaining reference to Proguard 5.2
2015-02-28 07:40:48 -06:00
Connor Tumbleson
2590521b33 fix all cherry-picks dumping files in wrong location 2015-01-21 08:10:42 -06:00
Ben Gruver
604e326412 Bump version number to 2.0.5
Conflicts:
	build.gradle
2015-01-21 07:43:36 -06:00
Ben Gruver
2312848efc Make ClassFileNameHandler thread-safe 2015-01-21 07:42:30 -06:00
Ben Gruver
d9e5b0a487 Switch the default for implicit references 2015-01-21 07:42:18 -06:00
Ben Gruver
97c52167cf Add stringtemplate dependency to smali, because proguard.
Conflicts:
	build.gradle
2015-01-21 07:42:02 -06:00
Ben Gruver
59a0d2f09b Refactor ClassFileNameHandler
This makes the logic quite a bit easier to follow, and fixes an issue
with the previous implementatation, where it didn't correctly handle
the case when were multiple long names that collided after being
shortened

Conflicts:
	brut.apktool.smali/util/src/main/java/ds/tree/DuplicateKeyException.java
	brut.apktool.smali/util/src/main/java/ds/tree/RadixTree.java
	brut.apktool.smali/util/src/main/java/ds/tree/RadixTreeImpl.java
	brut.apktool.smali/util/src/main/java/ds/tree/RadixTreeNode.java
	brut.apktool.smali/util/src/main/java/ds/tree/Visitor.java
	brut.apktool.smali/util/src/main/java/ds/tree/VisitorImpl.java
2015-01-21 07:40:52 -06:00
Jeff Smith
12107ecde8 No need to reevaluate 'resource != null' 2015-01-21 07:39:34 -06:00
Jeff Smith
f5765d37c8 Give comment-generating functions more precise naming 2015-01-21 07:39:20 -06:00
Jeff Smith
a4d5d2299b baksmali: Write comments about possible floating-point values
Conflicts:
	brut.apktool.smali/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/InstructionMethodItem.java
2015-01-21 07:39:11 -06:00
Connor Tumbleson
5afd6f5e69 [skip] adjust path to match apktool structure 2015-01-21 07:33:51 -06:00
Ben Gruver
52482802dc Make the checkPackagePrivateAccess functionality an option
This is only needed for 4.2.0, but not 4.2.1. Both are api 17, so we can't
tie this functionality to an api level.
2015-01-21 07:30:19 -06:00
Connor Tumbleson
89e6b06521 Implement dex entry for non classes.dex files
Conflicts:
	brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/DexFileFactory.java
2015-01-21 07:29:57 -06:00
Ben Gruver
6b6c2c09b6 Fix some generics issues when compiling with java 8 2015-01-21 07:27:17 -06:00
Ben Gruver
07ceb4fc8a Disable doclint for java 8
Conflicts:
	build.gradle
2015-01-21 07:26:53 -06:00
Ben Gruver
026d353fc7 Fix some javadoc issues 2015-01-21 07:25:12 -06:00
Ben Gruver
0153548c30 Expose the various fixed-size item counts in DexBackedDexFile 2015-01-21 07:24:58 -06:00
Ben Gruver
853da5a172 Refactor VariableSizeLookaheadIterator
Previously, when referencing instance fields from readNextItem,
the fields wouldn't have been initialized yet on the first call to
readNextItem
2015-01-21 07:24:47 -06:00
yyjdelete
3d3db44773 Use options.checkPackagePrivateAccess 2015-01-21 07:24:35 -06:00
yyjdelete
b2cf6b1d32 checkPackagePrivateAccess only for API 17(4.2)
Google revert this for compatibility.
see 7284c78e14 for details.

BTW, it seems that is also disabled for late 4.2
2015-01-21 07:24:24 -06:00
Ben Gruver
959133cbf0 Add some additional checks related to instruction size 2015-01-21 07:24:08 -06:00
edwardxwu
fe42130f05 Fixed the bug of not setting the location field of the instruction in addInstruction(i,instruction) method 2015-01-21 07:23:41 -06:00
Ben Gruver
1d597910e2 Improve the readability of the newline normalization stuff for tests 2015-01-21 07:22:40 -06:00
Ben Gruver
5388ed57ba Fix potential NPE in MethodAnalyzer 2015-01-21 07:22:27 -06:00
Ben Gruver
1b0a917a6a Implement implicit method/field references in baksmali 2015-01-21 07:21:57 -06:00
Ben Gruver
2772be8e9d Implement implicit method/field references in smali 2015-01-21 07:21:37 -06:00
Ben Gruver
4801482960 Add missing "break" from switch statement in BuilderClassPool 2015-01-21 07:21:27 -06:00
Ben Gruver
ca13778fe8 Ensure the annotation elements are sorted when written 2015-01-21 07:20:42 -06:00
Ben Gruver
b66bf0500b Improve how method parameter lists are lexed 2015-01-21 07:20:31 -06:00
Ben Gruver
e1742d8547 Clean up some unused/unneeded tokens in smaliParser.g 2015-01-21 07:14:26 -06:00
Ben Gruver
9596513f6f Add support for non-standard invoke-object-init/range instructions 2015-01-21 07:14:14 -06:00
Ben Gruver
83e63dab7a Truncate filenames based on their utf-8 length 2015-01-21 07:13:56 -06:00
Ben Gruver
838b35e477 Fix NPE when using a custom inline method table 2015-01-21 07:13:42 -06:00
Ben Gruver
f6f5fecf18 Minor comment fix in MutableMethodImplementation 2015-01-21 07:12:48 -06:00
Ben Gruver
394bb25b7c Allow but ignore multiple exception handlers for the same exception 2014-08-27 13:07:35 -05:00
Connor Tumbleson
292e49de0a [dexlib2] allow disassemble of apks with non classes.dex files 2014-08-16 08:37:00 -05:00
Connor Tumbleson
c80e906f53 bump smali version to 2.0.3 2014-02-04 09:52:39 -06:00
Connor Tumbleson
a91e87bb04 update to smali 2.0.3 2014-01-19 10:37:31 -06:00
Stephan Schmitz
073019fa54 Merge of cross-platform fix for smali's AnalysisTest.java
Merge https://github.com/JesusFreke/smali/pull/20 into fork: Use System.lineSeparator() for cross-platform compatible line endings for runTest() method in AnalysisTest.java. The patch fixes build failures of type `org.jf.baksmali.AnalysisTest > DuplicateTest FAILED [junit.framework.ComparisonFailure at AnalysisTest.java:107]` on Windows systems.
2013-11-18 13:31:07 +01:00
Connor Tumbleson
f89b51c74e Update to smali 2.0.2 2013-11-15 12:14:35 -06:00
Connor Tumbleson
03fc77cca8 [smali] update to 2.0 final 2013-10-11 11:43:59 -05:00
Connor Tumbleson
792188b9fe [smali] add untracked 2b6 files 2013-09-15 18:36:45 -05:00
Connor Tumbleson
79c68ed6d9 [smali] update to smali 2b6 2013-09-15 10:23:12 -05:00
Connor Tumbleson
bd24a670b2 [smali] add missing gradle files 2013-08-14 08:17:21 -05:00
Connor Tumbleson
652757cd36 [dexlib2] return UnresolvedClassException, instead of null when debug mode is enabled 2013-08-12 14:59:17 -05:00
Connor Tumbleson
7904ec2a7c dexlib2: ported "dontLoadClassPath feature" 2013-08-12 09:16:51 -05:00
Connor Tumbleson
2ca53880b1 baksmali: added DIFFPRE reg info 2013-08-12 09:16:50 -05:00
Connor Tumbleson
a2c8d64d84 adjust build.gradle to handle apktool / dexlib2 2013-08-12 09:16:50 -05:00
Connor Tumbleson
007a6d45a2 Update to smali 2b5 2013-08-12 09:16:50 -05:00