From 2a27f96188cf44228124d7940e9ef3276e6a43fd Mon Sep 17 00:00:00 2001
From: "iancottrell@chromium.org"
 <iancottrell@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>
Date: Wed, 23 Oct 2013 14:31:31 +0000
Subject: [PATCH] Replacing the javascript jar file merge with pure ant

BUG=310065

Review URL: https://codereview.chromium.org/35473002

git-svn-id: http://src.chromium.org/svn/trunk/src/build@230420 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
---
 android/ant/apk-compile.xml   | 25 ++++++++++++++++++++++---
 android/ant/apk-obfuscate.xml | 24 +++++++++++++++++++++---
 2 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/android/ant/apk-compile.xml b/android/ant/apk-compile.xml
index 4f3d664ae..69dc6a8c4 100644
--- a/android/ant/apk-compile.xml
+++ b/android/ant/apk-compile.xml
@@ -122,9 +122,28 @@
         <!-- get the project manifest package -->
         <xpath input="${out.manifest.abs.file}"
                 expression="/manifest/@package" output="project.app.package" />
-        <property name="create.test.jar.file"
-          location="${CREATE_TEST_JAR_PATH}" />
-        <script language="javascript" src="${create.test.jar.file}"/>
+        <loadresource property="project.app.packagepath">
+          <propertyresource name="project.app.package"/>
+          <filterchain>
+            <replacestring from="." to="/"/>
+          </filterchain>
+        </loadresource>
+        <property name="create.test.jar.exclusions"
+                  value="${project.app.packagepath}/R.class ${project.app.packagepath}/R$*.class ${project.app.packagepath}/Manifest.class ${project.app.packagepath}/Manifest$*.class ${project.app.packagepath}/BuildConfig.class"/>
+        <jar destfile="${TEST_JAR_PATH}"
+             excludes="${create.test.jar.exclusions}"
+             duplicate="preserve"
+             >
+          <restrict>
+            <name name="**/*.class"/>
+            <archives>
+              <zips>
+                <path refid="javac.custom.classpath"/>
+              </zips>
+            </archives>
+          </restrict>
+          <fileset dir="${out.dir}/classes"/>
+        </jar>
       </then>
     </if>
 
diff --git a/android/ant/apk-obfuscate.xml b/android/ant/apk-obfuscate.xml
index b15ce7365..4e737dae5 100644
--- a/android/ant/apk-obfuscate.xml
+++ b/android/ant/apk-obfuscate.xml
@@ -69,9 +69,27 @@
         <!-- get the project manifest package -->
         <xpath input="${out.manifest.abs.file}"
                 expression="/manifest/@package" output="project.app.package" />
-        <property name="create.test.jar.file"
-          location="${CREATE_TEST_JAR_PATH}" />
-        <script language="javascript" src="${create.test.jar.file}"/>
+        <loadresource property="project.app.packagepath">
+          <propertyresource name="project.app.package"/>
+          <filterchain>
+            <replacestring from="." to="/"/>
+          </filterchain>
+        </loadresource>
+        <property name="create.test.jar.exclusions" value="${project.app.packagepath}/R.class ${project.app.packagepath}/R$*.class ${project.app.packagepath}/Manifest.class ${project.app.packagepath}/Manifest$*.class ${project.app.packagepath}/BuildConfig.class"/>
+        <jar destfile="${TEST_JAR_PATH}"
+             excludes="${create.test.jar.exclusions}"
+             duplicate="preserve"
+             >
+          <restrict>
+            <name name="**/*.class"/>
+            <archives>
+              <zips>
+                <path refid="javac.custom.classpath"/>
+              </zips>
+            </archives>
+          </restrict>
+          <fileset dir="${out.dir}/classes"/>
+        </jar>
       </then>
     </if>
     <if>