Simplify android_webview apk generation gyp rules.

android_webview/javatests/android_webview_test_apk.xml

Index: android_webview/javatests/android_webview_test_apk.xml
diff --git a/android_webview/javatests/android_webview_test_apk.xml b/android_webview/javatests/android_webview_test_apk.xml
index b50b71a131f505b5e6374132ebd13b9c3c9320b0..36583deab364ccd8951011abd912e9399d29b68c 100644
--- a/android_webview/javatests/android_webview_test_apk.xml
+++ b/android_webview/javatests/android_webview_test_apk.xml
@@ -9,48 +9,30 @@
   <description>
     Building AndroidWebViewTest.apk
   </description>
-
   <import file="../../build/android/ant/common.xml"/>
 
-  <property name="target.abi" value="${APP_ABI}"/>
-  <property name="out.dir" location="${PRODUCT_DIR}/android_webview_test"/>
-  <property name="resource.absolute.dir" value="../res"/>
+  <property-value name="target.abi" value="${APP_ABI}"/>
+  <property-location name="out.dir" location="${PRODUCT_DIR}/android_webview_test"
+      check-exists="false"/>
+  <property name="resource.absolute.dir" value="${RESOURCE_DIR}"/>
   <property name="gen.absolute.dir" value="${out.dir}/gen"/>
-  <property name="native.libs.absolute.dir" location="${out.dir}/libs" />
-  <property name="asset.absolute.dir" location="${out.dir}/assets" />
+  <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"/>
+  <property name="generate.test.jar" value="true"/>
 
   <path id="out.dex.jar.input.ref">
-    <fileset dir="${PRODUCT_DIR}/android_webview_test/java/libs"/>
+    <filelist files="${INPUT_JARS_PATHS}"/>
   </path>
-  <property name="java.compilerargs" value="-classpath ${toString:out.dex.jar.input.ref}"/>
-
-  <!-- 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>
-
-  <target name="-post-compile">
-    <!-- We also want a .jar as well as an .apk for AndroidWebViewTest-debug
-         so that proguard can be used to list the tests by annotation. -->
-    <jar destfile="${out.dir}/${ant.project.name}-debug.jar">
-      <fileset dir="${out.dir}/classes" includes="**/*.class"/>
-      <zipfileset
-         includes="**/*.class"
-         src="${PRODUCT_DIR}/android_webview/java/libs/chromium_android_webview_javatests.jar"/>
-    </jar>
-
-  </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" />
 
+  <import file="../../build/android/ant/sdk-targets.xml"/>
+  <import file="${sdk.dir}/tools/ant/build.xml"/>
 </project>