Add test jar generation logic for ant builds.

content/shell/android/java/content_shell_apk.xml

Index: content/shell/android/java/content_shell_apk.xml
diff --git a/content/shell/android/java/content_shell_apk.xml b/content/shell/android/java/content_shell_apk.xml
index bc2434e86953a75a88e7e0efec26bf6aa1f1539a..67c9aecbfc180693953064cf75d86d082b2827cc 100644
--- a/content/shell/android/java/content_shell_apk.xml
+++ b/content/shell/android/java/content_shell_apk.xml
@@ -21,32 +21,22 @@
       check-exists="false"/>
   <property name="resource.absolute.dir" value="../res"/>
   <property name="gen.absolute.dir" value="${out.dir}/gen"/>
-  <property name="jar.libs.dir" value="${out.dir}/java/libs"/>
   <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"/>
+  <!-- Set the output directory for the final apk to the ${apks.dir}. -->
+  <property-location name="out.final.file" location="${apks.dir}/${ant.project.name}-debug.apk"
+     check-exists="false"/>
+  <property name="generate.test.jar" value="true"/>
 
   <path id="out.dex.jar.input.ref">
-    <pathelement location="${PRODUCT_DIR}/lib.java/chromium_base.jar"/>
-    <pathelement location="${PRODUCT_DIR}/lib.java/chromium_content.jar"/>
-    <pathelement location="${PRODUCT_DIR}/lib.java/chromium_media.jar"/>
-    <pathelement location="${PRODUCT_DIR}/lib.java/chromium_net.jar"/>
+    <pathelement location="${lib.java.dir}/chromium_content.jar"/>
+    <pathelement location="${lib.java.dir}/chromium_net.jar"/>
+    <pathelement location="${lib.java.dir}/chromium_base.jar"/>
+    <pathelement location="${lib.java.dir}/chromium_media.jar"/>
   </path>
-  <property name="java.compilerargs" value="-classpath ${toString:out.dex.jar.input.ref}"/>
-
-  <echo>classpath: ${toString:out.dex.jar.input.ref}</echo>
-
-  <!-- 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.
@@ -60,7 +50,7 @@
         <equals arg1="${build.target}" arg2="debug"/>
       </condition>
       <then>
-        <echo message="Copying gdbserver to the apk to enable native debugging" />
+        <echo message="Copying gdbserver to the apk to enable native debugging"/>
         <copy todir="${out.dir}/libs/${target.abi}">
           <path refid="native.libs.gdbserver"/>
         </copy>