Add support for the ChromiumTestShellTest APK.

chrome/android/testshell/javatests/chromium_testshell_test_apk.xml

Index: chrome/android/testshell/javatests/chromium_testshell_test_apk.xml
diff --git a/content/shell/android/java/content_shell_apk.xml b/chrome/android/testshell/javatests/chromium_testshell_test_apk.xml
similarity index 55%
copy from content/shell/android/java/content_shell_apk.xml
copy to chrome/android/testshell/javatests/chromium_testshell_test_apk.xml
index 9bcfa055d929392c98b647da2843c8217f94a8a9..573d16a5bbfdc4de1bf660112ac36b9e1c4b5f0b 100644
--- a/content/shell/android/java/content_shell_apk.xml
+++ b/chrome/android/testshell/javatests/chromium_testshell_test_apk.xml
@@ -4,50 +4,59 @@
   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=".">
+<project name="ChromiumTestShellTest" default="debug" basedir=".">
+
   <description>
-    Building ContentShell.apk
+    Building ChromiumTestShellTest.apk
   </description>
+
   <import file="../../../../build/android/ant/common.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="target.abi" value="${APP_ABI}"/>
+  <property name="out.dir" location="${PRODUCT_DIR}/chromium_testshell_test"/>
   <property name="resource.absolute.dir" value="${RESOURCE_DIR}"/>
   <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"/>
+  <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"/>

[Yaron, 2012/09/20 03:05:17]

nit: indentation.

[David Trainor- moved to gerrit, 2012/09/20 21:49:50]

Done.

 
   <path id="out.dex.jar.input.ref">
     <filelist files="${INPUT_JARS_PATHS}"/>
+    <pathelement location="${PRODUCT_DIR}/chromium_testshell/classes"/>
   </path>
-  <echo>resources: ${RESOURCE_DIR} classpath: ${toString:out.dex.jar.input.ref}</echo>
+
+  <path id="javac.custom.sourcepath">
+    <pathelement location="../../javatests/src" />
+	</path>

[Yaron, 2012/09/20 03:05:17]

nit: remove tab

[David Trainor- moved to gerrit, 2012/09/20 21:49:50]

Done.

+
+  <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">

[Yaron, 2012/09/20 03:05:17]

Remove this section: java apk tests shouldn't include gdbserver

[David Trainor- moved to gerrit, 2012/09/20 21:49:50]

Done.

-    <!--
-      Copy gdbserver to main libs directory if building debug.
+    <!-- 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.
-    -->
+      Release Official build java/ant as Release. -->
     <if>
       <condition>
-        <equals arg1="${build.target}" arg2="debug"/>
+        <equals arg1="${build.target}" arg2="debug" />
       </condition>
       <then>
         <echo message="Copying gdbserver to the apk to enable native debugging"/>
@@ -56,13 +65,20 @@
         </copy>
       </then>
     </if>
+
+    <!-- We also want a .jar as well as an .apk for ChromiumTestShellTest-debug

[Yaron, 2012/09/20 03:05:17]

Remove this as you're using generate.test.jar. See changes in
http://codereview.chromium.org/10905138/

[David Trainor- moved to gerrit, 2012/09/20 21:49:50]

Done.

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