Make the WebView apk build in the Chrome tree

android_webview/android_webview_tests.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'targets': [
     {
       'target_name': 'android_webview_apk',
       'type': 'none',
       'dependencies': [
-        'libwebviewchromium',
+        'libstandalonelibwebviewchromium',
         'android_webview_java',
         'android_webview_pak',
         'libdrawgl',
       ],
       'variables': {
         'apk_name': 'AndroidWebView',
         'java_in_dir': 'test/shell',
         'native_lib_target': 'libstandalonelibwebviewchromium',
         'resource_dir': 'test/shell/res',
         'extensions_to_not_compress': 'pak',
         'extra_native_libs': ['<(SHARED_LIB_DIR)/libdrawgl.>(android_product_extension)'],
         'additional_input_paths': [
-          '<(PRODUCT_DIR)/android_webview_apk/assets/webviewchromium.pak',
-          '<(PRODUCT_DIR)/android_webview_apk/assets/en-US.pak',
+          '<(PRODUCT_DIR)/android_webview_assets/webviewchromium.pak',
+          '<(PRODUCT_DIR)/android_webview_assets/en-US.pak',
           '<(PRODUCT_DIR)/android_webview_apk/assets/asset_file.html',
           '<(PRODUCT_DIR)/android_webview_apk/assets/cookie_test.html',
           '<(PRODUCT_DIR)/android_webview_apk/assets/asset_icon.png',
           '<(PRODUCT_DIR)/android_webview_apk/assets/full_screen_video_test.html',
         ],
         'conditions': [
           ['icu_use_data_file_flag==1', {
             'additional_input_paths': [
               '<(PRODUCT_DIR)/icudtl.dat',
             ],
           }],
         ],
       },
       'copies': [
         {
           'destination': '<(PRODUCT_DIR)/android_webview_apk/assets',
           'files': [
+            '<(PRODUCT_DIR)/android_webview_assets/webviewchromium.pak',
+            '<(PRODUCT_DIR)/android_webview_assets/en-US.pak',
             '<(java_in_dir)/assets/asset_file.html',
             '<(java_in_dir)/assets/asset_icon.png',
             '<(java_in_dir)/assets/cookie_test.html',
             '<(java_in_dir)/assets/full_screen_video_test.html',
           ],
           'conditions': [
             ['icu_use_data_file_flag==1', {
               'files': [
                 '<(PRODUCT_DIR)/icudtl.dat',
               ],
@@ skipping 117 matching lines @@
       'type': 'shared_library',
       # Do not depend on any other component here, since this target
       # builds a separate shared library!
       'include_dirs': [
         '..',
       ],
       'sources': [
           '../android_webview/test/shell/src/draw_gl/draw_gl.cc',
       ],
     },
+    {
+      'target_name': 'libstandalonelibwebviewchromium',
+      'includes': [
+        'libwebviewchromium.gypi',
+      ],
+    },
   ],
 }