[android_webview] Split out an apk folder from the glue folder.

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 d0e206385fca25e62fd46c4b919d05a3b0628f7c..fe8778060265b7802e2375e030126681f33d101a 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -266,7 +266,6 @@
     ['android_webview_build==0', {
       'includes': [
         'android_webview_tests.gypi',
-        'glue/android_webview_glue.gypi',
       ],
       'targets': [
         {
@@ -281,9 +280,43 @@
           ],
           'variables': {
             'java_in_dir': '../android_webview/java',
+            'has_java_resources': 1,
+            'R_package': 'org.chromium.android_webview',
+            'R_package_relpath': 'org/chromium/android_webview',
           },
           'includes': [ '../build/java.gypi' ],
         },
+        {
+          'target_name': 'system_webview_apk',
+          'variables': {
+            'android_sdk_jar': '<(DEPTH)/third_party/android_platform/webview/frameworks_1622219.jar',
+            'apk_name': 'SystemWebView',
+            'android_manifest_path': 'apk/java/AndroidManifest.xml',
+            'java_in_dir': '../android_webview/glue/java',
+            'resource_dir': 'apk/java/res',
+            'shared_resources': 1,
+          },
+          'includes': [ 'apk/system_webview_apk_common.gypi' ],
+          'copies': [
+            {
+              'destination': '<(PRODUCT_DIR)/android_webview_assets',
+              'files': [],
+              'conditions': [
+                ['icu_use_data_file_flag==1', {
+                  'files': [
+                    '<(PRODUCT_DIR)/icudtl.dat',
+                  ],
+                }],
+                ['v8_use_external_startup_data==1', {
+                  'files': [
+                    '<(PRODUCT_DIR)/natives_blob.bin',
+                    '<(PRODUCT_DIR)/snapshot_blob.bin',
+                  ],
+                }],
+              ],
+            },
+          ],
+        },
       ],
      }, {  # android_webview_build==1
       'targets': [