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

The reason for this separation is to distinguish the glue layer code
(which is shared amongst all of the WebView .apks) from the apk-specific
bits (which are not shared at all).

BUG=440792

Review URL: https://codereview.chromium.org/802453002

Cr-Commit-Position: refs/heads/master@{#308074}

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': [

android_webview/glue/java/AndroidManifest.xml → android_webview/apk/java/AndroidManifest.xml

@@ -4,6 +4,9 @@
   source code is governed by a BSD-style license that can be found in the
   LICENSE file.
 -->
+
+<!-- Please keep this in sync with the downstream android_webview manifest.
+-->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.webview">
     <uses-sdk android:minSdkVersion="21"

android_webview/glue/android_webview_glue_common.gypi → android_webview/apk/system_webview_apk_common.gypi

 # Copyright 2014 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.
+#
+# When making changes remember that this is shared with the internal .apk
+# build rules.
 {
   'type': 'none',
   'dependencies': [
@@ -9,17 +12,14 @@
     '<(DEPTH)/android_webview/android_webview.gyp:android_webview_pak',
   ],
   'variables': {
-    'android_sdk_jar': '<(DEPTH)/third_party/android_platform/webview/frameworks_1622219.jar',
-    'java_in_dir': 'java',
     'native_lib_target': 'libwebviewchromium',
     'never_lint': 1,
-    'resource_dir': 'java/res',
     'R_package': 'com.android.webview.chromium',
     'R_package_relpath': 'com/android/webview/chromium',
     'extensions_to_not_compress': 'pak',
     'asset_location': '<(PRODUCT_DIR)/android_webview_assets',
     'proguard_enabled': 'true',
-    'proguard_flags_paths': ['java/proguard.flags'],
+    'proguard_flags_paths': ['<(DEPTH)/android_webview/apk/java/proguard.flags'],
     # TODO: crbug.com/405035 Find a better solution for WebView .pak files.
     'additional_input_paths': [
       '<(PRODUCT_DIR)/android_webview_assets/webviewchromium.pak',

android_webview/glue/android_webview_glue.gypi

-# Copyright 2014 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': 'system_webview_apk',
-      'variables': {
-        'apk_name': 'SystemWebView',
-        'shared_resources': 1,
-      },
-      'includes': [ 'android_webview_glue_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',
-              ],
-            }],
-          ],
-        },
-      ],
-    },
-  ],
-}
-