Begin de-antification

build/android/ant/chromium-apk.xml

Index: build/android/ant/chromium-apk.xml
diff --git a/build/android/ant/chromium-apk.xml b/build/android/ant/chromium-apk.xml
index 4b059b5dae2c950728f5c4f20ac93910a930136d..6c86f886f761f9d3096fc1e7478591f6c293f5d2 100644
--- a/build/android/ant/chromium-apk.xml
+++ b/build/android/ant/chromium-apk.xml
@@ -20,71 +20,9 @@
   </description>
   <import file="common.xml"/>
 
-  <property-location name="out.dir" location="${OUT_DIR}" check-exists="false" />
+  <!-- TODO(cjhopman): Remove this property when all gyp files define the CHROMIUM_SRC property. -->
+  <property name="CHROMIUM_SRC" value="${PRODUCT_DIR}/../.." />
 
-  <path id="javac.srcdirs.additional">
-    <filelist files="${ADDITIONAL_SRC_DIRS}"/>
-    <filelist files="${GENERATED_SRC_DIRS}"/>
-  </path>
-
-  <!--
-    Include additional resource folders in the apk, e.g. content/.../res.  We
-    list the res folders in project.library.res.folder.path and the
-    corresponding java packages in project.library.packages, which must be
-    semicolon-delimited while ADDITIONAL_RES_PACKAGES is space-delimited, hence
-    the javascript task.
-  -->
-  <path id="project.library.res.folder.path">
-    <filelist files="${ADDITIONAL_RES_DIRS}"/>
-  </path>
-  <path id="project.library.bin.r.file.path">
-    <filelist files="${ADDITIONAL_R_TEXT_FILES}"/>
-  </path>
-  <script language="javascript">
-    var before = project.getProperty("ADDITIONAL_RES_PACKAGES");
-    project.setProperty("project.library.packages", before.replaceAll(" ", ";"));
-  </script>
-
-  <property-value name="target.abi" value="${APP_ABI}"/>
-  <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-value name="version.code" value="${APP_MANIFEST_VERSION_CODE}"/>
-  <property-value name="version.name" value="${APP_MANIFEST_VERSION_NAME}"/>
-
-  <!--
-    We use the PROGUARD_ENABLED flag for enabling proguard. By default proguard is enabled for
-    Release builds if proguard.config is set. Setting proguard.config even to an empty string will
-    enable proguard. Set this property only when we have explicitly enabled proguard.
-  -->
-  <condition property="proguard.config" value="${PROGUARD_FLAGS}">
-    <istrue value="${PROGUARD_ENABLED}"/>
-  </condition>
-  <!-- TODO(shashishekhar): Enable emma and code-coverage filters. -->
-
-  <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}.apk"
-      check-exists="false"/>
-
-  <!-- Classpath for javac -->
-  <path id="javac.custom.classpath">
-    <filelist files="${INPUT_JARS_PATHS}"/>
-  </path>
-
-  <path id="out.dex.jar.input.ref">
-    <path refid="javac.custom.classpath"/>
-  </path>
-
-  <import file="sdk-targets.xml"/>
-  <import file="${sdk.dir}/tools/ant/build.xml"/>
+  <import file="apk-build.xml"/>
 </project>