Add a native test target and for android_webview.

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 4a6cc4a5bd22c76b21008574c206868d4e589519..3405df69d920bbfec089c325dae8b4bab8f06089 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -5,12 +5,29 @@
   'variables': {
     'chromium_code': 1,
   },
+  'includes': [
+    'android_webview_tests.gypi',
+  ],
   'targets': [
     {
       'target_name': 'libwebviewchromium',
       'type': 'shared_library',
       'android_unmangled_name': 1,
       'dependencies': [
+        'android_webview_common',
+      ],
+      'ldflags': [
+        # fix linking to hidden symbols and re-enable this (crbug.com/157326)
+        '-Wl,--no-fatal-warnings'
+      ],
+      'sources': [
+        'lib/main/webview_entry_point.cc',
+      ],
+    },
+    {
+      'target_name': 'android_webview_common',
+      'type': 'static_library',
+      'dependencies': [
         '../content/content.gyp:content',
         '../android_webview/native/webview_native.gyp:webview_native',
         '../chrome/browser/component/components.gyp:navigation_interception',
@@ -22,10 +39,6 @@
         '..',
         '../skia/config',
       ],
-      'ldflags': [
-        # fix linking to hidden symbols and re-enable this (crbug.com/157326)
-        '-Wl,--no-fatal-warnings'
-      ],
       'sources': [
         'browser/aw_browser_context.cc',
         'browser/aw_browser_context.h',
@@ -76,7 +89,6 @@
         'lib/aw_browser_dependency_factory_impl.h',
         'lib/main/aw_main_delegate.cc',
         'lib/main/aw_main_delegate.h',
-        'lib/main/webview_entry_point.cc',
         'public/browser/gl_draw.h',
         'renderer/aw_content_renderer_client.cc',
         'renderer/aw_content_renderer_client.h',
@@ -142,37 +154,5 @@
       ],
       'includes': [ '../build/java_apk.gypi' ],
     },
-    {
-      'target_name': 'android_webview_test_apk',
-      'type': 'none',
-      'dependencies': [
-        '../base/base.gyp:base_java',
-        '../base/base.gyp:base_java_test_support',
-        '../chrome/browser/component/components.gyp:navigation_interception_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',
-        '../content/content.gyp:content_java_test_support',
-        '../media/media.gyp:media_java',
-        '../net/net.gyp:net_java',
-        '../ui/ui.gyp:ui_java',
-        'android_webview_java',
-        'libwebviewchromium',
-      ],
-      'variables': {
-        'package_name': 'android_webview_test',
-        'apk_name': 'AndroidWebViewTest',
-        'java_in_dir': '../android_webview/javatests',
-        'resource_dir': 'res',
-      },
-      'copies': [
-        {
-          'destination': '<(PRODUCT_DIR)/android_webview_test/assets',
-          'files': [ '<!@(find <(java_in_dir)/assets -type f -name "*")' ]
-        },
-      ],
-      'includes': [ '../build/java_apk.gypi' ],
-    },
   ],
 }