3 files changed, 81 insertions, 181 deletions
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index 42fd686..7082e2a 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -108,136 +108,77 @@
     {
       'target_name': 'android_webview_apk',
       'type': 'none',
+      'copies': [
+        {
+          'destination': '<(PRODUCT_DIR)/android_webview/assets',
+          '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',
+          ]
+        },
+      ],
+      'dependencies': [
+        'libwebview',
+        '../base/base.gyp:base_java',
+        '../net/net.gyp:net_java',
+        '../media/media.gyp:media_java',
+        # 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).
+        '../chrome/chrome.gyp:chrome_java',
+        '../chrome/browser/component/components.gyp:web_contents_delegate_android_java',
+        '../content/content.gyp:content_java',
+        '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources',
+        '<(DEPTH)/chrome/chrome_resources.gyp:packed_extra_resources',
+      ],
       '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)'],
-      },
-      # 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': [
+        {
+          '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',
-          '<(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',
-        ],
-        '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',
-        ],
-      }
+          ],
+        },
+        {
+          'action_name': 'android_webview_apk',
+          'inputs': [
+            '../build/android/ant/common.xml',
+            '../build/android/ant/sdk-targets.xml',
+            '<(DEPTH)/android_webview/java/android_webview_apk.xml',
+            '<(DEPTH)/android_webview/java/AndroidManifest.xml',
+            '<(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',
+            '>@(input_jars_paths)',
+          ],
+          'outputs': [
+            '<(PRODUCT_DIR)/android_webview/AndroidWebView-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)',
+            '-DANDROID_TOOLCHAIN=<(android_toolchain)',
+            '-DINPUT_JARS_PATHS=>(input_jars_paths)',
+            '-buildfile',
+            '<(DEPTH)/android_webview/java/android_webview_apk.xml',
+          ],
+        }
       ],
     },
     {
@@ -245,63 +186,26 @@
       'type': 'none',
       'dependencies': [
         'android_webview_apk',
+        'android_webview_java',
+        '../base/base.gyp:base_java',
+        '../base/base.gyp:base_java_test_support',
+        '../chrome/browser/component/components.gyp:web_contents_delegate_android_java',
+        '../content/content.gyp:content_java',
+        '../content/content.gyp:content_javatests',
+        '../media/media.gyp:media_java',
+        '../net/net.gyp:net_java',
         '<(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_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': [
+            '../build/android/ant/common.xml',
+            '../build/android/ant/sdk-targets.xml',
             '<(DEPTH)/android_webview/javatests/android_webview_test_apk.xml',
             '<(DEPTH)/android_webview/javatests/AndroidManifest.xml',
-            '<!@(find <(DEPTH)/android_webview/javatests/ -name "*.java")'
+            '<!@(find <(DEPTH)/android_webview/javatests/ -name "*.java")',
+            '>@(input_jars_paths)',
           ],
           'outputs': [
             '<(PRODUCT_DIR)/android_webview_test/AndroidWebViewTest-debug.apk',
@@ -315,6 +219,7 @@
             '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',
             '-DANDROID_SDK_VERSION=<(android_sdk_version)',
             '-DANDROID_GDBSERVER=<(android_gdbserver)',
+            '-DINPUT_JARS_PATHS=>(input_jars_paths)',
             '-buildfile',
             '<(DEPTH)/android_webview/javatests/android_webview_test_apk.xml',
           ]
diff --git a/android_webview/java/android_webview_apk.xml b/android_webview/java/android_webview_apk.xml
index f283c19..81f4224 100644
--- a/android_webview/java/android_webview_apk.xml
+++ b/android_webview/java/android_webview_apk.xml
@@ -20,12 +20,7 @@
   <property name="asset.absolute.dir" location="${out.dir}/assets"/>
 
   <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_web_contents_delegate_android.jar"/>
+    <filelist files="${INPUT_JARS_PATHS}"/>
   </path>
   <property name="java.compilerargs" value="-classpath ${toString:out.dex.jar.input.ref}"/>
 
diff --git a/android_webview/javatests/android_webview_test_apk.xml b/android_webview/javatests/android_webview_test_apk.xml
index b50b71a..b357e77 100644
--- a/android_webview/javatests/android_webview_test_apk.xml
+++ b/android_webview/javatests/android_webview_test_apk.xml
@@ -20,7 +20,7 @@
   <property name="asset.absolute.dir" location="${out.dir}/assets" />
 
   <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}"/>
 
@@ -41,7 +41,7 @@
       <fileset dir="${out.dir}/classes" includes="**/*.class"/>
       <zipfileset
          includes="**/*.class"
-         src="${PRODUCT_DIR}/android_webview/java/libs/chromium_android_webview_javatests.jar"/>
+         src="${PRODUCT_DIR}/lib.java/chromium_android_webview_javatests.jar"/>
     </jar>
 
   </target>