Make the WebView apk build in the Chrome tree

android_webview/android_webview.gyp

Index: android_webview/android_webview.gyp
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index 804968327e447bcc90b1f274636f1046dda94a52..d3170865e8bae9245a29fbd788f50846bf2587ff 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -7,59 +7,6 @@
   },
   'targets': [
     {
-      'target_name': 'libwebviewchromium',
-      'type': 'shared_library',
-      'android_unmangled_name': 1,
-      'dependencies': [
-        'android_webview_common',
-      ],
-      'conditions': [
-        # Avoid clashes between the versions of this library built with
-        # android_webview_build==1 by using a different name prefix.
-        [ 'android_webview_build==0', {
-          'product_prefix': 'libstandalone',
-        }],
-        [ 'android_webview_build==1', {
-          # When building inside the android tree we also need to depend on all
-          # the java sources generated from templates which will be needed by
-          # android_webview_java in android_webview/java_library_common.mk.
-          'dependencies': [
-            '../base/base.gyp:base_java_application_state',
-            '../base/base.gyp:base_java_memory_pressure_level_list',
-            '../content/content.gyp:content_gamepad_mapping',
-            '../content/content.gyp:gesture_event_type_java',
-            '../content/content.gyp:page_transition_types_java',
-            '../content/content.gyp:popup_item_type_java',
-            '../content/content.gyp:result_codes_java',
-            '../content/content.gyp:screen_orientation_values_java',
-            '../content/content.gyp:selection_event_type_java',
-            '../content/content.gyp:speech_recognition_error_java',
-            '../media/media.gyp:media_android_imageformat_list',
-            '../net/net.gyp:cert_verify_status_android_java',
-            '../net/net.gyp:certificate_mime_types_java',
-            '../net/net.gyp:net_errors_java',
-            '../net/net.gyp:private_key_types_java',
-            '../ui/android/ui_android.gyp:bitmap_format_java',
-            '../ui/android/ui_android.gyp:window_open_disposition_java',
-          ],
-        }],
-        [ 'android_webview_build==1 and use_system_skia==0', {
-          # When not using the system skia there are linker warnings about
-          # overriden hidden symbols which there's no easy way to eliminate;
-          # disable them. http://crbug.com/157326
-          'ldflags': [
-            '-Wl,--no-fatal-warnings',
-          ],
-          'ldflags!': [
-            '-Wl,--fatal-warnings',
-          ],
-        }],
-      ],
-      'sources': [
-        'lib/main/webview_entry_point.cc',
-      ],
-    },
-    {
       'target_name': 'android_webview_pak',
       'type': 'none',
       'dependencies': [
@@ -79,7 +26,7 @@
               '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
             ],
-            'pak_output': '<(PRODUCT_DIR)/android_webview_apk/assets/webviewchromium.pak',
+            'pak_output': '<(PRODUCT_DIR)/android_webview_assets/webviewchromium.pak',
           },
          'includes': [ '../build/repack_action.gypi' ],
         },
@@ -87,7 +34,7 @@
           'action_name': 'add_en_US_pak_locale',
           'variables': {
             'pak_inputs': ['<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_en-US.pak'],
-            'pak_output': '<(PRODUCT_DIR)/android_webview_apk/assets/en-US.pak',
+            'pak_output': '<(PRODUCT_DIR)/android_webview_assets/en-US.pak',
           },
          'includes': [ '../build/repack_action.gypi' ],
         }
@@ -270,11 +217,18 @@
         'renderer/print_render_frame_observer.h',
       ],
     },
+    {
+      'target_name': 'libwebviewchromium',
+      'includes': [
+          'libwebviewchromium.gypi',
+      ],
+    }
   ],
   'conditions': [
     ['android_webview_build==0', {
       'includes': [
         'android_webview_tests.gypi',
+        '../third_party/android_webview_glue/android_webview_glue.gypi',
       ],
       'targets': [
         {