Make chrome_public_apk, not chrome_staging_java depend on chrome_template_resources

This CL fixes a bug where we were incorrectly building the
chrome_template_resources target with manifest_package = "org.chromium.chrome" for
internal Chrome builds.

This CL makes chrome_public_apk (which is not shared with the internal build)
depend on chrome_template_resources instead of chrome_staging_java (which is
shared with the internal build). This allows the internal build to depend on a
chrome_template_resources-like target which uses the correct package name.

BUG=495428
TEST=None

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

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

1 files changed, 18 insertions, 18 deletions

diff --git a/chrome/android/chrome_apk.gyp b/chrome/android/chrome_apk.gyp
index d78111f..5a4b5f7 100644
--- a/chrome/android/chrome_apk.gyp
+++ b/chrome/android/chrome_apk.gyp
@@ -9,7 +9,7 @@
   '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,
@@ -140,7 +140,6 @@
         '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',
@@ -191,8 +190,22 @@
       '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',
@@ -214,20 +227,6 @@
       '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',
@@ -307,6 +306,7 @@
       },
       'dependencies': [
         'chrome_android_paks_copy',
+        'chrome_public_template_resources',
         'chrome_staging_java',
       ],
       'includes': [ 'chrome_apk.gypi' ],