Simplify android_webview apk generation gyp rules.

Common code has been moved to build/java_apk.gypi.

BUG=


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

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

4 files changed, 134 insertions, 290 deletions

diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index dd0b31a..11523dd 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -10,16 +10,16 @@
       'target_name': 'libwebview',
       'type': 'shared_library',
       'dependencies': [
-        '<(DEPTH)/chrome/chrome.gyp:browser',
-        '<(DEPTH)/chrome/chrome.gyp:renderer',
-        '<(DEPTH)/content/content.gyp:content',
-        '<(DEPTH)/android_webview/native/webview_native.gyp:webview_native',
-        '<(DEPTH)/chrome/browser/component/components.gyp:web_contents_delegate_android',
-        '<(DEPTH)/chrome/browser/component/components.gyp:browser_component_jni_headers',
+        '../chrome/chrome.gyp:browser',
+        '../chrome/chrome.gyp:renderer',
+        '../content/content.gyp:content',
+        '../android_webview/native/webview_native.gyp:webview_native',
+        '../chrome/browser/component/components.gyp:web_contents_delegate_android',
+        '../chrome/browser/component/components.gyp:browser_component_jni_headers',
       ],
       'include_dirs': [
-        '<(DEPTH)',
-        '<(DEPTH)/skia/config',
+        '..',
+        '../skia/config',
       ],
       'sources': [
         'common/android_webview_message_generator.cc',
@@ -86,261 +86,101 @@
       'target_name': 'android_webview_java',
       'type': 'none',
       'dependencies': [
-        '<(DEPTH)/content/content.gyp:content_java',
-        '<(DEPTH)/chrome/browser/component/components.gyp:web_contents_delegate_android_java',
-        '<(DEPTH)/ui/ui.gyp:ui_java',
+        '../content/content.gyp:content_java',
+        '../chrome/browser/component/components.gyp:web_contents_delegate_android_java',
+        '../ui/ui.gyp:ui_java',
       ],
       'variables': {
         'package_name': 'android_webview_java',
-        'java_in_dir': '<(DEPTH)/android_webview/java',
+        'java_in_dir': '../android_webview/java',
       },
       'includes': [ '../build/java.gypi' ],
     },
     {
-      'target_name': 'android_webview_javatests',
+      'target_name': 'android_webview_apk',
       'type': 'none',
       'dependencies': [
-        'android_webview_java',
-        '<(DEPTH)/base/base.gyp:base_java_test_support',
-        '<(DEPTH)/content/content.gyp:content_java',
-        '<(DEPTH)/content/content.gyp:content_javatests',
-        '<(DEPTH)/chrome/browser/component/components.gyp:web_contents_delegate_android_java',
+        '../base/base.gyp:base_java',
+        '../chrome/browser/component/components.gyp:web_contents_delegate_android_java',
+        '../chrome/chrome_resources.gyp:packed_extra_resources',
+        '../chrome/chrome_resources.gyp:packed_resources',
+        '../content/content.gyp:content_java',
+        '../media/media.gyp:media_java',
+        '../net/net.gyp:net_java',
+        '../ui/ui.gyp:ui_java',
+        'libwebview',
       ],
       'variables': {
-        'package_name': 'android_webview_javatests',
-        'java_in_dir': '<(DEPTH)/android_webview/javatests',
-      },
-      'includes': [ '../build/java.gypi' ],
-    },
-
-    {
-      'target_name': 'android_webview_apk',
-      'type': 'none',
-      'actions': [
-      {
-        'action_name': 'copy_base_jar',
-        'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_base.jar'],
-        'outputs': ['<(PRODUCT_DIR)/android_webview/java/libs/chromium_base.jar'],
-        'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-      },
-      {
-        'action_name': 'copy_net_jar',
-        'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_net.jar'],
-        'outputs': ['<(PRODUCT_DIR)/android_webview/java/libs/chromium_net.jar'],
-        'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-      },
-      {
-        'action_name': 'copy_media_jar',
-        'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_media.jar'],
-        'outputs': ['<(PRODUCT_DIR)/android_webview/java/libs/chromium_media.jar'],
-        'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-      },
-      {
-        'action_name': 'copy_content_jar',
-        'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_content.jar'],
-        'outputs': ['<(PRODUCT_DIR)/android_webview/java/libs/chromium_content.jar'],
-        'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-      },
-      {
-        'action_name': 'copy_ui_jar',
-        'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_ui.jar'],
-        'outputs': ['<(PRODUCT_DIR)/android_webview/java/libs/chromium_ui.jar'],
-        'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-      },
-      # TODO: This should be removed once we stop sharing the chrome/ layer JNI
-      # registration code.  We currently include this because we reuse the
-      # chrome/ layer JNI registration code (which will crash if these classes
-      # are not present in the APK).
-      {
-        'action_name': 'copy_chrome_jar',
-        'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_chrome.jar'],
-        'outputs': ['<(PRODUCT_DIR)/android_webview/java/libs/chromium_chrome.jar'],
-        'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-      },
-      {
-        'action_name': 'copy_web_contents_delegate_android_java',
-        'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_web_contents_delegate_android.jar'],
-        'outputs': ['<(PRODUCT_DIR)/android_webview/java/libs/chromium_web_contents_delegate_android.jar'],
-        'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-      },
-      {
-        'action_name': 'copy_android_webview_jar',
-        'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_android_webview_java.jar'],
-        'outputs': ['<(PRODUCT_DIR)/android_webview/java/libs/chromium_android_webview_java.jar'],
-        'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-      },
-      {
-        'action_name': 'copy_android_webview_test_jar',
-        'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_android_webview_javatests.jar'],
-        'outputs': ['<(PRODUCT_DIR)/android_webview/java/libs/chromium_android_webview_javatests.jar'],
-        'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-      },
-      {
-        'action_name': 'copy_chrome_pak',
-        'inputs': ['<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak'],
-        'outputs': ['<(PRODUCT_DIR)/android_webview/assets/chrome.pak'],
-        'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-      },
-      {
-        'action_name': 'copy_chrome_100_percent_pak',
-        'inputs': ['<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak'],
-        'outputs': ['<(PRODUCT_DIR)/android_webview/assets/chrome_100_percent.pak'],
-        'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-      },
-      {
-        'action_name': 'copy_resources_pak',
-        'inputs': ['<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak'],
-        'outputs': ['<(PRODUCT_DIR)/android_webview/assets/resources.pak'],
-        'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-      },
-      {
-        'action_name': 'copy_en_pak',
-        'inputs': ['<(SHARED_INTERMEDIATE_DIR)/repack/en-US.pak'],
-        'outputs': ['<(PRODUCT_DIR)/android_webview/assets/en-US.pak'],
-        'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-      },
-      {
-        'action_name': 'copy_and_strip_so',
-        'inputs': ['<(SHARED_LIB_DIR)/libwebview.so'],
-        'outputs': ['<(PRODUCT_DIR)/android_webview/libs/<(android_app_abi)/libwebview.so'],
-        'action': [
-            '<!(/bin/echo -n $STRIP)',
-            '--strip-unneeded',  # All symbols not needed for relocation.
-            '<@(_inputs)',
-            '-o',
-            '<@(_outputs)',
-        ],
-      },
-      {
-        'action_name': 'android_webview_apk',
-        'inputs': [
-          '<(DEPTH)/android_webview/java/android_webview_apk.xml',
-          '<(DEPTH)/android_webview/java/AndroidManifest.xml',
-          '<(PRODUCT_DIR)/android_webview/java/libs/chromium_android_webview_java.jar',
-          '<(PRODUCT_DIR)/android_webview/java/libs/chromium_android_webview_javatests.jar',
-          '<(PRODUCT_DIR)/android_webview/java/libs/chromium_base.jar',
-          '<(PRODUCT_DIR)/android_webview/java/libs/chromium_net.jar',
-          '<(PRODUCT_DIR)/android_webview/java/libs/chromium_media.jar',
-          '<(PRODUCT_DIR)/android_webview/java/libs/chromium_content.jar',
-          '<(PRODUCT_DIR)/android_webview/java/libs/chromium_chrome.jar',
-          '<(PRODUCT_DIR)/android_webview/java/libs/chromium_ui.jar',
+        'package_name': 'android_webview',
+        'apk_name': 'AndroidWebView',
+        'java_in_dir': '../android_webview/java',
+        'resource_dir': '../res',
+        'native_libs_paths': ['<(PRODUCT_DIR)/android_webview/libs/<(android_app_abi)/libwebview.so'],
+        'input_pak_files': [
           '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak',
           '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak',
           '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak',
           '<(SHARED_INTERMEDIATE_DIR)/repack/en-US.pak',
-          '<(PRODUCT_DIR)/android_webview/libs/<(android_app_abi)/libwebview.so',
         ],
-        'outputs': [
-          '<(PRODUCT_DIR)/android_webview/AndroidWebView-debug.apk',
+        'copied_pak_files': [
+          '<(PRODUCT_DIR)/android_webview/assets/chrome.pak',
+          '<(PRODUCT_DIR)/android_webview/assets/chrome_100_percent.pak',
+          '<(PRODUCT_DIR)/android_webview/assets/resources.pak',
+          '<(PRODUCT_DIR)/android_webview/assets/en-US.pak',
         ],
-        'action': [
-          'ant',
-          '-DPRODUCT_DIR=<(ant_build_out)',
-          '-DAPP_ABI=<(android_app_abi)',
-          '-DANDROID_SDK=<(android_sdk)',
-          '-DANDROID_SDK_ROOT=<(android_sdk_root)',
-          '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',
-          '-DANDROID_SDK_VERSION=<(android_sdk_version)',
-          '-DANDROID_GDBSERVER=<(android_gdbserver)',
-          '-buildfile',
-          '<(DEPTH)/android_webview/java/android_webview_apk.xml',
-        ],
-        'dependencies': [
-          'libwebview',
-          'android_webview_java',
-          'android_webview_javatests',
-          '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources',
-          '<(DEPTH)/chrome/chrome_resources.gyp:packed_extra_resources',
-        ],
-      }
+        'additional_input_paths': [ '<@(copied_pak_files)' ],
+      },
+      'actions': [
+        {
+          'action_name': 'copy_and_strip_so',
+          'inputs': ['<(SHARED_LIB_DIR)/libwebview.so'],
+          'outputs': ['<(PRODUCT_DIR)/android_webview/libs/<(android_app_abi)/libwebview.so'],
+          'action': [
+            '<(android_strip)',
+            '--strip-unneeded',  # All symbols not needed for relocation.
+            '<@(_inputs)',
+            '-o',
+            '<@(_outputs)',
+          ],
+        },
+        {
+          'action_name': 'copy_pak_files',
+          'inputs': [ '<@(input_pak_files)' ],
+          'outputs': [ '<@(copied_pak_files)' ],
+          'action': [
+            'cp',
+            '<@(input_pak_files)',
+            '-t',
+            '<(PRODUCT_DIR)/android_webview/assets/',
+          ],
+        },
       ],
+      'includes': [ '../build/java_apk.gypi' ],
     },
     {
       'target_name': 'android_webview_test_apk',
       'type': 'none',
       'dependencies': [
-        'android_webview_apk',
-        '<(DEPTH)/content/content.gyp:content_javatests',
-      ],
-      'actions': [
-        {
-          'action_name': 'copy_base_jar',
-          'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_base.jar'],
-          'outputs': ['<(PRODUCT_DIR)/android_webview_test/java/libs/chromium_base.jar'],
-          'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-        },
-        {
-          'action_name': 'copy_base_javatests_jar',
-          'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_base_javatests.jar'],
-          'outputs': ['<(PRODUCT_DIR)/android_webview_test/java/libs/chromium_base_javatests.jar'],
-          'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-        },
-        {
-          'action_name': 'copy_net_jar',
-          'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_net.jar'],
-          'outputs': ['<(PRODUCT_DIR)/android_webview_test/java/libs/chromium_net.jar'],
-          'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-        },
-        {
-          'action_name': 'copy_media_jar',
-          'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_media.jar'],
-          'outputs': ['<(PRODUCT_DIR)/android_webview_test/java/libs/chromium_media.jar'],
-          'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-        },
-        {
-          'action_name': 'copy_ui_jar',
-          'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_ui.jar'],
-          'outputs': ['<(PRODUCT_DIR)/android_webview_test/java/libs/chromium_ui.jar'],
-          'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-        },
-        {
-          'action_name': 'copy_content_jar',
-          'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_content.jar'],
-          'outputs': ['<(PRODUCT_DIR)/android_webview_test/java/libs/chromium_content.jar'],
-          'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-        },
-        {
-          'action_name': 'copy_web_contents_delegate_android_java',
-          'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_web_contents_delegate_android.jar'],
-          'outputs': ['<(PRODUCT_DIR)/android_webview_test/java/libs/chromium_web_contents_delegate_android.jar'],
-          'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-        },
-        {
-          'action_name': 'copy_content_javatests_jar',
-          'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_content_javatests.jar'],
-          'outputs': ['<(PRODUCT_DIR)/android_webview_test/java/libs/chromium_content_javatests.jar'],
-          'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-        },
-        {
-          'action_name': 'copy_android_webview_jar',
-          'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_android_webview_java.jar'],
-          'outputs': ['<(PRODUCT_DIR)/android_webview_test/java/libs/chromium_android_webview_java.jar'],
-          'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
-        },
-        {
-          'action_name': 'android_webview_test_generate_apk',
-          'inputs': [
-            '<(DEPTH)/android_webview/javatests/android_webview_test_apk.xml',
-            '<(DEPTH)/android_webview/javatests/AndroidManifest.xml',
-            '<!@(find <(DEPTH)/android_webview/javatests/ -name "*.java")'
-          ],
-          'outputs': [
-            '<(PRODUCT_DIR)/android_webview_test/AndroidWebViewTest-debug.apk',
-          ],
-          'action': [
-            'ant',
-            '-DPRODUCT_DIR=<(ant_build_out)',
-            '-DAPP_ABI=<(android_app_abi)',
-            '-DANDROID_SDK=<(android_sdk)',
-            '-DANDROID_SDK_ROOT=<(android_sdk_root)',
-            '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',
-            '-DANDROID_SDK_VERSION=<(android_sdk_version)',
-            '-DANDROID_GDBSERVER=<(android_gdbserver)',
-            '-buildfile',
-            '<(DEPTH)/android_webview/javatests/android_webview_test_apk.xml',
-          ]
-        }
+        '../base/base.gyp:base_java',
+        '../base/base.gyp:base_java_test_support',
+        '../chrome/browser/component/components.gyp:web_contents_delegate_android_java',
+        '../chrome/chrome_resources.gyp:packed_extra_resources',
+        '../chrome/chrome_resources.gyp:packed_resources',
+        '../content/content.gyp:content_java',
+        '../content/content.gyp:content_javatests',
+        '../media/media.gyp:media_java',
+        '../net/net.gyp:net_java',
+        '../ui/ui.gyp:ui_java',
+        'android_webview_java',
+        'libwebview',
       ],
+      'variables': {
+        'package_name': 'android_webview_test',
+        'apk_name': 'AndroidWebViewTest',
+        'java_in_dir': '../android_webview/javatests',
+        'resource_dir': '../res',
+      },
+      'includes': [ '../build/java_apk.gypi' ],
     },
   ],
 }
diff --git a/android_webview/java/android_webview_apk.xml b/android_webview/java/android_webview_apk.xml
index d35ab7e..558bfb3 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>
diff --git a/android_webview/javatests/android_webview_test_apk.xml b/android_webview/javatests/android_webview_test_apk.xml
index b50b71a..36583de 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>
diff --git a/android_webview/res/.keep b/android_webview/res/.keep
new file mode 100644
index 0000000..1b29063
--- /dev/null
+++ b/android_webview/res/.keep
@@ -0,0 +1,2 @@
+The APK build rule from build/java_apk.gypi that we use requires a res/ folder
+(even an empty one) to work.