commit e7afb8c8980d8d87660b0b9135e4947e907b4aba
author Jesse Wilson <jessewilson@google.com> Fri Jan 06 14:16:41 2012 -0500
committer Jesse Wilson <jessewilson@google.com> Fri Jan 06 14:16:41 2012 -0500
tree 02aee5b4a56475cd4532b7bf3c78e616f5dcae1a
parent ff314e1f06b974be78de3356a71072dbf0a450cd

Use jarjar to repackage dx to avoid conflicts with dx.jar.

build.xml

diff --git a/build.xml b/build.xml
index db786ca..0c2bcca 100644
--- a/build.xml
+++ b/build.xml
@@ -27,10 +27,13 @@
     </target>
 
     <target name="jar" depends="compile">
-        <jar destfile="build/dexmaker.jar" update="true" index="true">
+        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
+            classpath="lib/jarjar.jar"/>
+        <jarjar jarfile="build/dexmaker.jar">
             <fileset dir="build/dx/classes"/>
             <fileset dir="build/main/classes"/>
-        </jar>
+            <rule pattern="com.android.dx.**" result="com.google.dexmaker.dx.@1"/>
+        </jarjar>
     </target>
 
     <target name="docs">

lib/jarjar.jar

diff --git a/lib/jarjar.jar b/lib/jarjar.jar
new file mode 100644
index 0000000..352c00a
--- /dev/null
+++ b/lib/jarjar.jar
Binary files differ