Make apks build from a single ant .xml template

build/android/ant/chromium-apk.xml

Index: build/android/ant/chromium-apk.xml
diff --git a/content/shell/android/javatests/content_shell_test_apk.xml b/build/android/ant/chromium-apk.xml
similarity index 66%
rename from content/shell/android/javatests/content_shell_test_apk.xml
rename to build/android/ant/chromium-apk.xml
index a66c28660d3597f4ec1f270d063aa1c58b41a97d..2779a5e6c086fad4bed071a035149dab69ab3f0b 100644
--- a/content/shell/android/javatests/content_shell_test_apk.xml
+++ b/build/android/ant/chromium-apk.xml
@@ -1,36 +1,43 @@
-<?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="ContentShellTest" default="debug" basedir=".">
+<project default="debug">
+  <property name="ant.project.name" value="${APK_NAME}"/>
 
   <description>
-    Building ContentShellTest.apk
+    Building ${ant.project.name}.apk
   </description>
+  <import file="common.xml"/>
 
-  <import file="../../../../build/android/ant/common.xml"/>
+  <property-location
+      name="out.dir"
+      location="${PRODUCT_DIR}/${PACKAGE_NAME}"
+      check-exists="false"
+  />
+
+  <path id="javac.srcdirs.additional">
+    <filelist files="${ADDITIONAL_SRC_DIRS}"/>
+    <filelist files="${GENERATED_SRC_DIRS}"/>
+  </path>
 
   <property-value name="target.abi" value="${APP_ABI}"/>
-  <property-location name="out.dir" location="${PRODUCT_DIR}/content_shell_test"
-      check-exists="false"/>
   <property name="resource.absolute.dir" value="${RESOURCE_DIR}"/>
   <property-value name="gen.absolute.dir" value="${out.dir}/gen"/>
   <property-location name="native.libs.absolute.dir" location="${out.dir}/libs"
       check-exists="false"/>
-  <property-location name="asset.absolute.dir" location="${out.dir}/assets"
-      check-exists="false"/>
+
+  <condition property="asset.absolute.dir"
+      value="${out.dir}/assets"
+      else="${ASSET_DIR}">
+    <equals arg1="${ASSET_DIR}" arg2=""/>
+  </condition>
+
   <!-- 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="javac.custom.sourcepath">
-    <filelist files="${ADDITIONAL_SRC_DIRS}"/>
-    <filelist files="${GENERATED_SRC_DIRS}"/>
-  </path>
 
   <path id="out.dex.jar.input.ref">
     <filelist files="${INPUT_JARS_PATHS}"/>
@@ -41,6 +48,7 @@
     <path refid="out.dex.jar.input.ref"/>
   </path>
 
-  <import file="../../../../build/android/ant/sdk-targets.xml"/>
+  <import file="sdk-targets.xml"/>
   <import file="${sdk.dir}/tools/ant/build.xml"/>
 </project>
+