Simplify android_webview apk generation gyp rules.

android_webview/java/android_webview_apk.xml

Index: android_webview/java/android_webview_apk.xml
diff --git a/android_webview/java/android_webview_apk.xml b/android_webview/java/android_webview_apk.xml
index d35ab7e7a758758c7a66c782c530f77f73ffeb31..558bfb3d9fe7c17e5b0e7df43091c0d5eca3b095 100644
--- a/android_webview/java/android_webview_apk.xml
+++ b/android_webview/java/android_webview_apk.xml
@@ -10,39 +10,59 @@
   </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}/android_webview"
       check-exists="false"/>
-  <property name="resource.absolute.dir" value="../res"/>
+  <property name="resource.absolute.dir" value="${RESOURCE_DIR}"/>
   <property name="gen.absolute.dir" value="${out.dir}/gen"/>
-  <property name="jar.libs.dir" value="${out.dir}/java/libs"/>
+  <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">
-    <fileset file="${out.dir}/java/libs/chromium_base.jar"/>
-    <fileset file="${out.dir}/java/libs/chromium_chrome.jar"/>
-    <fileset file="${out.dir}/java/libs/chromium_content.jar"/>
-    <fileset file="${out.dir}/java/libs/chromium_media.jar"/>
-    <fileset file="${out.dir}/java/libs/chromium_net.jar"/>
-    <fileset file="${out.dir}/java/libs/chromium_ui.jar"/>
-    <fileset file="${out.dir}/java/libs/chromium_web_contents_delegate_android.jar"/>
+    <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>
+  <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>
+  </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>