From 5b6f3cbe4b88a98262a8b30b546543b8394e1f67 Mon Sep 17 00:00:00 2001
From: Piotr Gurgul <pgurgul@google.com>
Date: Wed, 23 Sep 2009 15:51:44 -0700
Subject: [PATCH] Add --no-locals to dx when dexing instrumented classes

Emma instrumentation modifies .class files in that way they cannot be processed
by dx without --no-locals option.
---
 tools/scripts/android_rules.xml | 5 +++++
 1 file changed, 5 insertions(+)

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