Make apks build from a single ant .xml template

The ant build files for each of the apks that we create consisted of
only fairly straightforward boilerplate. With the recent changes to
java_apk.gypi and the gyp targets we can now build these correctly from
a single .xml with the differences in how the targets are built being
reflected in the gyp files (and then passed into ant).

TBR=joth
BUG=145991


Review URL: https://chromiumcodereview.appspot.com/10959034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160396 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 0 insertions, 120 deletions

diff --git a/content/shell/android/java/content_shell_apk.xml b/content/shell/android/java/content_shell_apk.xml
deleted file mode 100644
index efd2a2d..0000000
--- a/content/shell/android/java/content_shell_apk.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?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"/>
-
-  <!--
-      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="${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"/>
-  <!-- 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"/>
-
-  <path id="out.dex.jar.input.ref">
-    <filelist files="${INPUT_JARS_PATHS}"/>
-  </path>
-  <echo>resources: ${RESOURCE_DIR} classpath: ${toString:out.dex.jar.input.ref}</echo>
-  <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>
-
-    <!-- Package all the compiled .class files into a .jar. -->
-    <jar
-      jarfile="${lib.java.dir}/chromium_${PACKAGE_NAME}.jar"
-      basedir="${out.classes.absolute.dir}"
-    />
-  </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>
diff --git a/content/shell/android/javatests/content_shell_test_apk.xml b/content/shell/android/javatests/content_shell_test_apk.xml
deleted file mode 100644
index a66c286..0000000
--- a/content/shell/android/javatests/content_shell_test_apk.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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=".">
-
-  <description>
-    Building ContentShellTest.apk
-  </description>
-
-  <import file="../../../../build/android/ant/common.xml"/>
-
-  <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"/>
-  <!-- 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}"/>
-  </path>
-
-  <!-- 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>