LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add --no-locals to dx when dexing instrumented classes

Browse Source 
Emma instrumentation modifies .class files in that way they cannot be processed
by dx without --no-locals option.
This commit is contained in:
Piotr Gurgul
2009-09-23 15:51:44 -07:00
parent 95a32505be
commit 5b6f3cbe4b
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/scripts/android_rules.xml
View File

@@ -111,12 +111,14 @@
output dex filename and external libraries to dex (optional) --> output dex filename and external libraries to dex (optional) -->
<macrodef name="dex-helper"> <macrodef name="dex-helper">
<element name="external-libs" optional="yes" /> <element name="external-libs" optional="yes" />
<element name="extra-parameters" optional="yes" />
<sequential> <sequential>
<echo>Converting compiled files and external libraries into ${intermediate.dex.file}... <echo>Converting compiled files and external libraries into ${intermediate.dex.file}...
</echo> </echo>
<apply executable="${dx}" failonerror="true" parallel="true"> <apply executable="${dx}" failonerror="true" parallel="true">
<arg value="--dex" /> <arg value="--dex" />
<arg value="--output=${intermediate.dex.file}" /> <arg value="--output=${intermediate.dex.file}" />
<extra-parameters />
<arg line="${verbose.option}" /> <arg line="${verbose.option}" />
<arg path="${out.classes.absolute.dir}" /> <arg path="${out.classes.absolute.dir}" />
<fileset dir="${external.libs.absolute.dir}" includes="*.jar" /> <fileset dir="${external.libs.absolute.dir}" includes="*.jar" />
@@ -380,6 +382,9 @@
<target name="-dex-instrumented" depends="-emma-instrument"> <target name="-dex-instrumented" depends="-emma-instrument">
<dex-helper> <dex-helper>
<extra-parameters>
<arg value="--no-locals" />
</extra-parameters>
<external-libs> <external-libs>
<fileset file="${emma.dir}/emma_device.jar" /> <fileset file="${emma.dir}/emma_device.jar" />
</external-libs> </external-libs>