Allow chrome_shell_paks target to be reused

chrome/chrome_shell.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.
 
 # This GYPI allows independent customization of the chrome shell in a manner
 # similar to content shell (in content_shell.gypi). Notably, this file does
 # NOT contain chrome_android_core, which is independent of the chrome shell
 # and should be separately customized.
 {
   'variables': {
@@ skipping 90 matching lines @@
         'jinja_output': '<(SHARED_INTERMEDIATE_DIR)/chrome_shell_manifest/AndroidManifest.xml',
       },
       'includes': [ '../build/android/jinja_template.gypi' ],
     },
     {
       # GN: //chrome/android:chrome_shell_apk
       'target_name': 'chrome_shell_apk',
       'type': 'none',
       'dependencies': [
         'chrome_java',
-        'chrome_shell_paks',
+        'chrome_android_paks_copy',
         'libchromeshell',
         '../media/media.gyp:media_java',
       ],
       'variables': {
         'apk_name': 'ChromeShell',
         'android_manifest_path': '<(SHARED_INTERMEDIATE_DIR)/chrome_shell_manifest/AndroidManifest.xml',
         'native_lib_version_name': '<(version_full)',
         'java_in_dir': 'android/shell/java',
         'resource_dir': 'android/shell/res',
         'asset_location': '<(PRODUCT_DIR)/../assets/<(package_name)',
@@ skipping 13 matching lines @@
       # This target should only be used by targets which instrument
       # chrome_shell_apk.
       'target_name': 'chrome_shell_apk_java',
       'type': 'none',
       'dependencies': [
         'chrome_shell_apk',
       ],
       'includes': [ '../build/apk_fake_jar.gypi' ],
     },
     {
-      'target_name': 'chrome_shell_paks',
-      'type': 'none',
-      'dependencies': [
-        '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources',
-        '<(DEPTH)/chrome/chrome_resources.gyp:packed_extra_resources',
-      ],
-      'copies': [
-        {
-          'destination': '<(chrome_android_pak_output_folder)',
-          'files': [
-            '<@(chrome_android_pak_input_resources)',
-          ],
-        }
-      ],
-    },
-    {
       # GN: //chrome/android:chrome_sync_shell_manifest
       'target_name': 'chrome_sync_shell_manifest',
       'type': 'none',
       'variables': {
         'jinja_inputs': ['android/sync_shell/java/AndroidManifest.xml.jinja2'],
         'jinja_output': '<(SHARED_INTERMEDIATE_DIR)/chrome_sync_shell_manifest/AndroidManifest.xml',
       },
       'includes': [ '../build/android/jinja_template.gypi' ],
     },
     {
       # GN: //chrome/android:chrome_sync_shell_apk
       'target_name': 'chrome_sync_shell_apk',
       'type': 'none',
       'dependencies': [
         'chrome_java',
-        'chrome_shell_paks',
+        'chrome_android_paks_copy',
         'libchromesyncshell',
         '../media/media.gyp:media_java',
         '../sync/sync.gyp:sync_java_test_support',
       ],
       'variables': {
         'apk_name': 'ChromeSyncShell',
         'android_manifest_path': '<(SHARED_INTERMEDIATE_DIR)/chrome_sync_shell_manifest/AndroidManifest.xml',
         'R_package': 'org.chromium.chrome.shell',
         'native_lib_version_name': '<(version_full)',
         'java_in_dir': 'android/shell/java',
@@ skipping 16 matching lines @@
       'target_name': 'chrome_sync_shell_apk_java',
       'type': 'none',
       'dependencies': [
         'chrome_sync_shell_apk',
       ],
       'includes': [ '../build/apk_fake_jar.gypi' ],
     },
   ],
 
 }