Ben Gruver
22e85fc3ff
Add a --classes option for disassemble/deodex commands
2016-10-16 13:43:34 -07:00
Albert Gorski
43669ecc6e
Ensure all smali files are closed after the writing is complete
...
This makes sure that all smali files are closed after writing to them by
surrounding the writer code with a try/finally block that closes the output
stream once the writing has completed or when an exception occurs.
2016-10-15 21:12:23 -07:00
Albert Gorski
e75f2b230a
Ensure the ZipFile is closed in isZipFile() of ZipDexContainer
...
When calling isZipFile() in ZipDexContainer, the ZipFile would remain open if
the file was in fact a zip file but the ZipFile object would then go out of
scope thus creating a resource leak. This ensures that the ZipFile is closed
by adding a finally clause containing a close call at the end of the try catch
block.
2016-10-15 21:12:23 -07:00
Ben Gruver
5189797292
Unify how sections are referenced in DexPool and DexBuilder
2016-10-15 20:58:19 -07:00
Ben Gruver
f2935deb16
Fix classpath loading for pre-art odex files
2016-10-15 15:39:11 -07:00
Ben Gruver
4eefe294e4
Add a public utility method for verifying dex/odex headers
2016-10-15 15:07:32 -07:00
Ben Gruver
145bc820d3
Add a ClassPath(Iterable<ClassProvider>) constructor
2016-10-15 10:27:10 -07:00
Narayan Kamath
55c33ebb09
Add a placeholder ART version number / api level for aosp/master.
...
Also make invoke-polymorphic conditional on this new art version.
This also fixes a bug where the version was being selected incorrectly
due to a parameter name that shadowed a local variable.
2016-10-07 15:06:07 +01:00
Ben Gruver
615d383320
Make ZipDexContainer more subclass-friendly
2016-10-04 23:05:47 -07:00
Ben Gruver
2996766649
Add MultiDexContainer.getOpcodes()
2016-10-04 23:03:38 -07:00
Ben Gruver
4d59c14ef1
Bump the version number to 2.2b3
2016-10-04 00:11:33 -07:00
Ben Gruver
686d628128
Bad proguard! Don't strip out jcommander classes!
2016-10-04 00:10:46 -07:00
Ben Gruver
331fdcca07
Bump the version number to 2.2b2
2016-10-03 20:09:56 -07:00
Ben Gruver
5d77b13557
Add proguard rule to keep ColonParameterSplitter
2016-10-03 20:01:39 -07:00
Ben Gruver
dcaf46cefc
Specify specific version for mockito dependency
2016-10-02 18:26:17 -07:00
Ben Gruver
458398ff7c
Fix the smalidea build for gradle 3.1
2016-10-02 18:12:22 -07:00
Frieder Bluemle
e231d681d7
Update Gradle wrapper to 3.1
2016-10-02 18:12:22 -07:00
Ben Gruver
17f2abc2f8
bump the version number to 2.2b1
2016-10-02 16:43:59 -07:00
Ben Gruver
2d0f6254b1
Merge branch 'v2.2_WIP'
2016-10-02 16:41:52 -07:00
Ben Gruver
384161e060
Detect and ignore out-of-range debug info offsets
2016-10-02 16:34:41 -07:00
Ben Gruver
219bdff2d1
Properly implement the art <-> api version map
2016-10-02 16:05:22 -07:00
Ben Gruver
c2231759f5
Fix the proguard keep rules for smali/baksmali
2016-10-02 16:04:29 -07:00
Ben Gruver
59256149f1
Add functionality for efficient multi-dex writing with DexPool
...
This adds support to DexPool for mark()/reset(), which can be used to
"rollback" the last added class in case it caused a constant pool overflow.
This also adds a "DexWriter.hasOverflowed()" helper method to determine if
any of the size-constrained pools have overflowed.
2016-10-02 12:18:52 -07:00
Ben Gruver
6f8366a7a3
Fix the default classpath dir for an input file in the current directory
2016-10-02 12:18:52 -07:00
Ben Gruver
af8a063472
Set the minimum oat version for the fixed post-default-method vtable to 87
2016-10-02 12:18:52 -07:00
Ben Gruver
67171366db
Reparent interface methods in a vtable
...
These are now reparented at the point where a invoke-virtual/quick
is being resolved, if needed
2016-10-02 12:18:52 -07:00
Ben Gruver
dbd9db303a
Tweak ZipDexContainer so it doesn't keep an open ZipFile
2016-10-02 12:18:51 -07:00
Ben Gruver
ab20c37fd0
Fix up the post-default interface generation
2016-10-01 17:07:18 -07:00
Ben Gruver
37f5436932
Allow interning classes into a DexPool externally
2016-10-01 17:07:18 -07:00
Ben Gruver
9c039ef1de
Implement ReflectionUtils.dexToJavaName
2016-10-01 17:07:18 -07:00
Ben Gruver
7f20300b92
Change DexInputEntry.loadDexFile to accept an Opcodes object instead of an api
2016-10-01 17:07:18 -07:00
Ben Gruver
8f27f45fb1
Add Opcodes.getDefault
...
This replace various uses of hardcoded Opcodes.forApi() with
Opcodes.getDefault() or other alternatives as applicable
2016-10-01 17:07:18 -07:00
Ben Gruver
0de5ef0ce7
Add support for the buggy post-default method vtable generation
...
This replicates the buggy vtable generation logic for Android 7.0
2016-10-01 17:07:17 -07:00
Ben Gruver
7cb0937324
Add the ability to specify the oat version to use when listing vtables
2016-09-24 18:26:35 -07:00
Ben Gruver
a54523e080
More default method vtable fixes
2016-09-24 18:16:55 -07:00
Ben Gruver
8081311d30
Implement toString for Method/Field/Proto references
2016-09-24 18:15:07 -07:00
Ben Gruver
17054d5c3d
Load oat dependencies by default, if present
2016-09-24 18:11:50 -07:00
Ben Gruver
c3270cf991
Don't attempt to list vtables for interface classes
2016-09-24 18:10:52 -07:00
Ben Gruver
158f6b0b44
Add the directory containing the input file as a classpath search dir by default
2016-09-24 18:10:18 -07:00
Ben Gruver
dcc7a2b806
Remove OatDexFile.getOatFile in favor of getContainer
2016-09-24 18:07:26 -07:00
Albert Gorski
8b309d62f4
Use guava's 'Joiner' instead of 'String.join'
...
This replaces the usage of the Java 8 'String.join' method with guava's
'Joiner' which is Java 6 compatible.
2016-09-22 23:25:11 -07:00
Albert Gorski
8f6f59cc66
Close all smali files after it is finished writing to them.
...
This is important for instances where smali is invoked through the run method instead of
main.
2016-09-22 23:25:00 -07:00
Ben Gruver
bb062e9336
Fix ReflectionUtils.javaToDexName
...
Fixes the conversion for primitive and array types
2016-09-22 19:50:27 -07:00
Ben Gruver
1aa9df3867
Fix the ordering of methods in the post-default-method vtable calculation
2016-09-22 19:49:29 -07:00
Ben Gruver
b7f98c8758
Use --check-package-private-access by default for oat files
2016-09-19 09:08:54 -07:00
Ben Gruver
ecd89816b3
Fix up some minor issues with --normalize-virtual-methods
2016-09-19 09:08:54 -07:00
Ben Gruver
815f023e4e
Use a class reference for interface methods in the vtable
2016-09-19 09:08:54 -07:00
Ben Gruver
41ba26d00a
Improve the canNarrowAfterInstanceOf check when using an empty bootclasspath
...
If the types in question can't be resolved, we just assume that the
narrowing can't happen.
2016-09-19 09:08:54 -07:00
Ben Gruver
12a3d71759
Add the ability to specify an empty bootclasspath
2016-09-19 09:08:54 -07:00
Ben Gruver
1d26e1be09
Rename the list classpath command to list dependencies
2016-09-19 09:08:54 -07:00