Add test jar generation logic for ant builds.

content/shell/android/javatests/content_shell_test_apk.xml

Index: content/shell/android/javatests/content_shell_test_apk.xml
diff --git a/content/shell/android/javatests/content_shell_test_apk.xml b/content/shell/android/javatests/content_shell_test_apk.xml
index 78b6c0e7722a813f2e9dda66f202342835d734a3..d18677af7b2c96680d6b99f6f3eed5bccfb5f6a7 100644
--- a/content/shell/android/javatests/content_shell_test_apk.xml
+++ b/content/shell/android/javatests/content_shell_test_apk.xml
@@ -12,74 +12,37 @@
 
   <import file="../../../../build/android/ant/common.xml"/>
   <import file="../../../../build/android/ant/sdk-targets.xml"/>
-  <property name="target.abi" value="${APP_ABI}"/>
+  <property-value name="target.abi" value="${APP_ABI}"/>
   <property name="out.dir" location="${PRODUCT_DIR}/content_shell_test"/>
   <property name="resource.absolute.dir" value="../res"/>
   <property name="gen.absolute.dir" value="${out.dir}/gen"/>
-  <path id="native.libs.gdbserver">
-    <fileset file="${android.gdbserver}"/>
-  </path>
   <property name="native.libs.absolute.dir" location="${out.dir}/libs" />
   <property name="asset.absolute.dir" location="${out.dir}/assets" />
-
-  <path id="out.dex.jar.input.ref">
-    <pathelement location="${PRODUCT_DIR}/lib.java/chromium_base.jar"/>
-    <pathelement location="${PRODUCT_DIR}/lib.java/chromium_base_javatests.jar"/>
-    <pathelement location="${PRODUCT_DIR}/lib.java/chromium_content.jar"/>
-    <pathelement location="${PRODUCT_DIR}/lib.java/chromium_content_javatests.jar"/>
-    <pathelement location="${PRODUCT_DIR}/lib.java/chromium_media.jar"/>
-    <pathelement location="${PRODUCT_DIR}/lib.java/chromium_net.jar"/>
-    <pathelement location="${PRODUCT_DIR}/lib.java/chromium_net_javatests.jar"/>
-    <pathelement location="${PRODUCT_DIR}/content_shell/classes"/>
-  </path>
-  <property name="java.compilerargs" value="-classpath ${toString:out.dex.jar.input.ref}"/>
-
-  <!-- We expect PRODUCT_DIR to be set like the gyp var
-       (e.g. $ROOT/out/Debug) -->
-  <fail message="PRODUCT_DIR env var not set?">
-    <condition>
-      <not>
-        <isset property="PRODUCT_DIR"/>
-      </not>
-    </condition>
-  </fail>
-
-  <target name="-post-compile">
-    <!-- copy gdbserver to main libs directory if building debug.
-      TODO(jrg): for now, Chrome on Android always builds native code
-      as Release and java/ant as Debug, which means we always install
-      gdbserver.  Resolve this discrepancy, possibly by making this
-      Release Official build java/ant as Release. -->
-    <if>
-      <condition>
-        <equals arg1="${build.target}" arg2="debug" />
-      </condition>
-      <then>
-        <echo message="Copying gdbserver to the apk to enable native debugging"/>
-        <copy todir="${out.dir}/libs/${target.abi}">
-          <path refid="native.libs.gdbserver"/>
-        </copy>
-      </then>
-    </if>
-
-    <!-- We also want a .jar as well as an .apk for ContentShellTest-debug
-         so that proguard can be used to list the tests by annotation. -->
-    <jar destfile="${out.dir}/${ant.project.name}-debug.jar">
-      <fileset dir="${out.dir}/classes" includes="**/*.class"/>
-      <zipfileset
-         includes="**/*.class"
-         src="${PRODUCT_DIR}/lib.java/chromium_content_javatests.jar"/>
-      <zipfileset
-         includes="**/*.class"
-         src="${PRODUCT_DIR}/lib.java/chromium_net_javatests.jar"/>
-    </jar>
-
-  </target>
+  <!-- Set the output directory for the final apk to the ${apks.dir} -->

[cjhopman, 2012/09/06 22:33:41]

Nit: full stop.

[shashi, 2012/09/07 00:41:33]

Done.

+  <property-location name="out.final.file" location="${apks.dir}/${ant.project.name}-debug.apk"
+     check-exists="false" />
+  <property name="generate.test.jar" value="true" />
 
   <!-- Classpath for javac -->
   <path id="javac.custom.classpath">
-    <path refid="out.dex.jar.input.ref"/>
+    <fileset file="${lib.java.dir}/chromium_base_javatests.jar"/>
+    <fileset file="${lib.java.dir}/chromium_content_javatests.jar"/>
+    <fileset file="${lib.java.dir}/chromium_net_javatests.jar"/>
+    <fileset file="${lib.java.dir}/chromium_media.jar"/>
+    <fileset file="${test.lib.java.dir}/ContentShell-debug.jar"/>
   </path>
-  <import file="${sdk.dir}/tools/ant/build.xml" />
 
+  <!-- Use the output jar for dex, this jar contains all the compiled
+       classes as well as classes from included jars.
+  -->
+  <path id="out.dex.jar.input.ref">
+    <fileset file="${test.lib.java.dir}/ContentShellTest-debug.jar"/>
+  </path>
+  <!-- Set the classes directory to null, to avoid including compiled
+       classes, the compiled classes are already included in generated
+       {ant.project.name)-debug.jar file.
+  -->
+  <property name="out.dex.input.absolute.dir" value="" />
+
+  <import file="${sdk.dir}/tools/ant/build.xml" />
 </project>