Revert "Revert 155950 - Add initial Chromium TestShell support for Android"

chrome/android/testshell/java/chromium_testshell_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=".">
+<project name="ChromiumTestShell" default="debug" basedir=".">
   <description>
-    Building ContentShell.apk
+    Building ChromiumTestShell.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"
+
+  <!-- Root directory for output -->
+  <property-location name="out.dir" location="${PRODUCT_DIR}/chromium_testshell"
       check-exists="false"/>
-  <property name="resource.absolute.dir" value="../res"/>
+  <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"/>
+
+  <!-- Standard directory for chromium_*.jars -->
+  <property-value name="lib.java.dir" value="${PRODUCT_DIR}/lib.java"/>
   <path id="native.libs.gdbserver">
     <fileset file="${android.gdbserver}"/>
   </path>
+  <!-- Specify directory for libchromiumtestshell.so so that it can be packaged by aapt -->
   <property name="native.libs.absolute.dir" location="${out.dir}/libs"/>
-  <property name="asset.absolute.dir" location="${out.dir}/assets"/>
+  <!-- Specify assets dir, this allows both mmm and SDK builds to use same pak files.  -->
+  <property-location name="asset.absolute.dir" location="${PRODUCT_DIR}/../assets/chrome"/>
+
+  <property name="version.code" value="16"/>
+  <property name="version.name" value="0.1 Developer Build"/>
 
   <path id="out.dex.jar.input.ref">
-    <filelist files="${INPUT_JARS_PATHS}"/>
+    <pathelement location="${lib.java.dir}/chromium_base.jar"/>
+    <pathelement location="${lib.java.dir}/chromium_content.jar"/>
+    <pathelement location="${lib.java.dir}/chromium_media.jar"/>
+    <pathelement location="${lib.java.dir}/chromium_net.jar"/>
+    <pathelement location="${lib.java.dir}/chromium_chrome.jar"/>
+    <pathelement location="${lib.java.dir}/chromium_web_contents_delegate_android.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>
 
@@ skipping 19 matching lines @@
   </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"/>
 </project>
+