Make chrome_public_apk, not chrome_staging_java depend on chrome_template_resources

chrome/android/chrome_apk.gyp

 # Copyright 2015 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.
 {
   'includes': [
     '../../chrome/chrome_android_paks.gypi', # Included for the list of pak resources.
     '../../build/util/version.gypi'
    ],
   'variables': {
     'chromium_code': 1,
     'package_name': 'chrome_public_apk',
-    'manifest_package%': 'org.chromium.chrome',
+    'manifest_package': 'org.chromium.chrome',
     'chrome_public_apk_manifest': '<(SHARED_INTERMEDIATE_DIR)/chrome_public_apk_manifest/AndroidManifest.xml',
     'chrome_public_test_apk_manifest': '<(SHARED_INTERMEDIATE_DIR)/chrome_public_test_apk_manifest/AndroidManifest.xml',
     'never_lint': 1,
     'chrome_java_dir': 'java_staging',
     'chrome_java_tests_dir': 'javatests',
     'chrome_java_test_support_dir': '../test/android/javatests_staging',
     'chrome_native_sources_dir': '../browser/android/',
     # This list is shared with GN.
     'chrome_staging_jni_files': [
       '<(chrome_java_dir)/src/org/chromium/chrome/browser/bookmark/EditBookmarkHelper.java',
@@ skipping 110 matching lines @@
       'variables': {
         'java_in_dir': '<(chrome_java_dir)',
         'R_package': 'com.google.android.apps.chrome',
         'R_package_relpath': 'com/google/android/apps/chrome',
         'has_java_resources': 1,
         'res_channel_dir': '<(chrome_java_dir)/res_default',
         'res_extra_dirs': ['<(res_channel_dir)'],
         'res_extra_files': ['<!@(find <(res_channel_dir) -type f)'],
       },
       'dependencies': [
-        'chrome_template_resources',
         'custom_tabs_service_aidl',
         '<(DEPTH)/base/base.gyp:base_java',
         '<(DEPTH)/chrome/chrome.gyp:chrome_java',
         '<(DEPTH)/chrome/chrome.gyp:document_tab_model_info_proto_java',
         '<(DEPTH)/components/components.gyp:app_restrictions_resources',
         '<(DEPTH)/components/components.gyp:navigation_interception_java',
         '<(DEPTH)/components/components.gyp:service_tab_launcher',
         '<(DEPTH)/components/components.gyp:web_contents_delegate_android_java',
         '<(DEPTH)/content/content.gyp:content_java',
         '<(DEPTH)/media/media.gyp:media_java',
@@ skipping 30 matching lines @@
         '<(DEPTH)/chrome/chrome.gyp:chrome_java',
         '<(DEPTH)/chrome/chrome.gyp:chrome_java_test_support',
         '<(DEPTH)/content/content_shell_and_tests.gyp:content_java_test_support',
         '<(DEPTH)/net/net.gyp:net_java',
         '<(DEPTH)/net/net.gyp:net_java_test_support',
         '<(DEPTH)/sync/sync.gyp:sync_java_test_support',
       ],
       'includes': [ '../../build/java.gypi' ],
     },
     {
-      # GN: //chrome/android:chrome_template_resources
-      'target_name': 'chrome_template_resources',
+      # GN: //chrome/android:custom_tabs_service_aidl
+      'target_name': 'custom_tabs_service_aidl',
+      'type': 'none',
+      'variables': {
+        'aidl_interface_file': '<(chrome_java_dir)/src/org/chromium/chrome/browser/customtabs/common.aidl',
+        'aidl_import_include': '<(chrome_java_dir)/src/org/chromium/chrome/browser/customtabs',
+      },
+      'sources': [
+        '<(chrome_java_dir)/src/org/chromium/chrome/browser/customtabs/IBrowserConnectionCallback.aidl',
+        '<(chrome_java_dir)/src/org/chromium/chrome/browser/customtabs/IBrowserConnectionService.aidl',
+      ],
+      'includes': [ '../../build/java_aidl.gypi' ],
+    },
+    {
+      # GN: //chrome/android:chrome_public_template_resources
+      'target_name': 'chrome_public_template_resources',
       'type': 'none',
       'variables': {
         'jinja_inputs_base_dir': '<(chrome_java_dir)/res_template',
         'jinja_inputs': [
           '<(jinja_inputs_base_dir)/xml/searchable.xml',
           '<(jinja_inputs_base_dir)/xml/syncadapter.xml',
         ],
         'jinja_outputs_zip': '<(PRODUCT_DIR)/res.java/<(_target_name).zip',
         'jinja_variables': [
           'manifest_package=<(manifest_package)',
         ],
       },
       'all_dependent_settings': {
         'variables': {
           'additional_input_paths': ['<(jinja_outputs_zip)'],
           'dependencies_res_zip_paths': ['<(jinja_outputs_zip)'],
         },
       },
       'includes': [ '../../build/android/jinja_template.gypi' ],
     },
     {
-      # GN: //chrome/android:custom_tabs_service_aidl
-      'target_name': 'custom_tabs_service_aidl',
-      'type': 'none',
-      'variables': {
-        'aidl_interface_file': '<(chrome_java_dir)/src/org/chromium/chrome/browser/customtabs/common.aidl',
-        'aidl_import_include': '<(chrome_java_dir)/src/org/chromium/chrome/browser/customtabs',
-      },
-      'sources': [
-        '<(chrome_java_dir)/src/org/chromium/chrome/browser/customtabs/IBrowserConnectionCallback.aidl',
-        '<(chrome_java_dir)/src/org/chromium/chrome/browser/customtabs/IBrowserConnectionService.aidl',
-      ],
-      'includes': [ '../../build/java_aidl.gypi' ],
-    },
-    {
       # GN: //chrome/android:chrome_public
       'target_name': 'libchrome_public',
       'type': 'shared_library',
       'dependencies': [
         'libchrome_staging',
         '<(DEPTH)/chrome/chrome.gyp:chrome_android_core',
       ],
       'include_dirs': [
         '<(DEPTH)',
       ],
@@ skipping 59 matching lines @@
           # until the number of 32 bit devices which don't support this
           # approach falls to a minimal level -  http://crbug.com/390618.
           ['component != "shared_library" and profiling==0 and (target_arch == "arm64" or target_arch == "x86_64")', {
             'load_library_from_zip_file': '<(chrome_apk_load_library_from_zip)',
             'load_library_from_zip': '<(chrome_apk_load_library_from_zip)',
           }],
         ],
       },
       'dependencies': [
         'chrome_android_paks_copy',
+        'chrome_public_template_resources',
         'chrome_staging_java',
       ],
       'includes': [ 'chrome_apk.gypi' ],
     },
     {
       # GN: N/A
       # chrome_public_apk creates a .jar as a side effect. Any java targets
       # that need that .jar in their classpath should depend on this target,
       'target_name': 'chrome_public_apk_java',
       'type': 'none',
@@ skipping 89 matching lines @@
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: