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 58%
rename from content/shell/android/javatests/content_shell_test_apk.xml
rename to build/android/ant/chromium-apk.xml
index 8f8ee1d4fd31b1696259b78701495bab823bb436..3da13081d6271d67284bed2a84e5e5e9996bfe0e 100644
--- a/content/shell/android/javatests/content_shell_test_apk.xml
+++ b/build/android/ant/chromium-apk.xml
@@ -1,38 +1,41 @@
-<?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"

[Yaron, 2012/09/21 01:57:01]

I think hanging lines should be indented 4 (same below)

[cjhopman, 2012/09/28 01:14:25]

Done.

+    location="${PRODUCT_DIR}/${PACKAGE_NAME}"
+    check-exists="false"
+  />
 
   <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"/>
-
-  <property-location name="contentshell.classes.dir"
-      location="${PRODUCT_DIR}/content_shell/classes"/>
 
   <path id="out.dex.jar.input.ref">
     <filelist files="${INPUT_JARS_PATHS}"/>
-    <pathelement location="${contentshell.classes.dir}"/>
   </path>
 
   <!-- Classpath for javac -->
@@ -40,6 +43,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>
+