Add test jar generation logic for ant builds.

content/shell/android/java/content_shell_apk.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2012 The Chromium Authors. All rights reserved.
   Use of this source code is governed by a BSD-style license that can be
   found in the LICENSE file.
 -->
 <project name="ContentShell" default="debug" basedir=".">
   <description>
     Building ContentShell.apk
   </description>
   <import file="../../../../build/android/ant/common.xml"/>
   <import file="../../../../build/android/ant/sdk-targets.xml"/>
 
   <!-- Convert the buildtype to lowercase. E.g Debug -> debug, Release -> release.  -->
   <script language="javascript">
     project.setProperty("configuration.name",
                         project.getProperty("CONFIGURATION_NAME").toLowerCase())
   </script>
   <property-value name="target.abi" value="${APP_ABI}"/>
   <property-location name="out.dir" location="${PRODUCT_DIR}/content_shell"
       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"/>
+    <fileset file="${lib.java.dir}/chromium_content.jar"/>

[cjhopman, 2012/09/07 19:50:35]

<pathelement location=

[shashi, 2012/09/07 23:31:31]

Done.

+    <fileset file="${lib.java.dir}/chromium_net.jar"/>
+    <fileset file="${lib.java.dir}/chromium_base.jar"/>
+    <fileset file="${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) -->

[cjhopman, 2012/09/07 19:50:35]

We are no longer checking that PRODUCT_DIR is set? Maybe you could add this
check in common.xml

[shashi, 2012/09/07 21:02:30]

It is already done in common.xml, due to safe setters. In fact all common
directories use safe setters and are defined relative to PRODUCT_DIR, so if
PRODUCT_DIR is not set, step will fail and we no longer depend on env variables
so the logic here is redundant.

On 2012/09/07 19:50:35, cjhopman wrote:

-  <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>
   </target>
 
   <!-- Classpath for javac -->
   <path id="javac.custom.classpath">
     <path refid="out.dex.jar.input.ref"/>
   </path>
   <import file="${sdk.dir}/tools/ant/build.xml"/>
 </project>