Make chrome_public_apk, not chrome_staging_java depend on chrome_template_resources

chrome/android/BUILD.gn

 # 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.
 
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build/module_args/v8.gni")
 import("//chrome/version.gni")
 import("//testing/test.gni")
 import("//third_party/icu/config.gni")
@@ skipping 603 matching lines @@
 }
 
 #GYP: //chrome/android/chrome_apk.gyp:chrome_staging_java
 android_resources("chrome_staging_java_resources") {
   resource_dirs = [
     "java_staging/res",
     "java_staging/res_default",
   ]
   custom_package = "com.google.android.apps.chrome"
   deps = [
-    ":chrome_template_resources",
     "//chrome/android:chrome_java_resources",
     "//components/policy:app_restrictions_resources",
     "//third_party/android_tools:android_support_v7_appcompat_resources",
     "//third_party/android_tools:android_support_v7_mediarouter_resources",
   ]
   if (!enable_configuration_policy) {
     deps -= [ "//components/policy:app_restrictions_resources" ]
   }
 }
 
-# GYP: //chrome/android/chrome_apk.gyp:chrome_template_resources
-jinja_template_resources("chrome_template_resources") {
-  resources = [
-    "java_staging/res_template/xml/searchable.xml",
-    "java_staging/res_template/xml/syncadapter.xml",
-  ]
-  res_dir = "java_staging/res_template"
-  variables = jinja_variables
-}
-
 # GYP: //chrome/android/chrome_apk.gyp:chrome_staging_test_java
 android_library("chrome_staging_test_java") {
   testonly = true
   DEPRECATED_java_in_dir = "javatests/src"
 
   deps = [
     "//chrome/android:chrome_staging_java",
     "//chrome/android:chrome_staging_java_resources",
     "//chrome/test/android:chrome_staging_test_support_java",
     "//base:base_java",
@@ skipping 102 matching lines @@
   sources += [ "$root_build_dir/resources.pak" ]
 }
 
 # GYP: //chrome/android/chrome_apk.gyp:chrome_apk_manifest
 jinja_template("chrome_public_apk_manifest") {
   input = "java_staging/AndroidManifest.xml"
   output = "$root_gen_dir/chrome_public_apk_manifest/AndroidManifest.xml"
   variables = jinja_variables + [ "min_sdk_version=16" ]
 }
 
+# GYP: //chrome/android/chrome_apk.gyp:chrome_public_template_resources
+jinja_template_resources("chrome_public_template_resources") {
+  resources = [
+    "java_staging/res_template/xml/searchable.xml",
+    "java_staging/res_template/xml/syncadapter.xml",
+  ]
+  res_dir = "java_staging/res_template"
+  variables = jinja_variables
+}
+
 # GYP: //chrome/android/chrome_apk.gyp:libchrome_public
 shared_library("chrome_public") {
   deps = [
     "//chrome/android:chrome_staging",
     "//chrome:chrome_android_core",
   ]
   gypi_values = exec_script(
           "//build/gypi_to_gn.py",
           [
             rebase_path("chrome_apk.gyp"),
@@ skipping 20 matching lines @@
   native_libs = [ "$root_build_dir/lib.stripped/libchrome_public.so" ]
   native_lib_version_name = _version_full
   asset_location = chrome_public_apk_assets_dir
 
   deps = [
     ":chrome_staging_java",
     ":chrome_staging_java_resources",
     ":chrome_public",
     ":chrome_public_apk_assets",
     ":chrome_public_apk_manifest",
+    ":chrome_public_template_resources",
     "//base:base_java",
     "//third_party/android_tools:google_play_services_default_resources",
   ]
 }
 
 chrome_public_test_apk_manifest =
     "$root_gen_dir/chrome_public_test_apk_manifest/AndroidManifest.xml"
 
 # GYP: //chrome/android/chrome_apk.gyp:chrome_public_test_apk_manifest
 jinja_template("chrome_public_test_apk_manifest") {
   input = "javatests/AndroidManifest.xml"
   output = chrome_public_test_apk_manifest
   variables = jinja_variables
 }
 
 # GYP: //chrome/android/chrome_apk.gyp:chrome_public_test_apk
 instrumentation_test_apk("chrome_public_test_apk") {
   # TODO(GYP,cjhopman): Does this need version code/name?
   apk_name = "ChromePublicTest"
   apk_under_test = ":chrome_public_apk"
   android_manifest = chrome_public_test_apk_manifest
   deps = [
     ":chrome_public_test_apk_manifest",
     "//chrome/test/android:chrome_staging_test_support_java",
     "//chrome/android:chrome_staging_test_java",
   ]
   isolate_file = "../chrome_public_test_apk.isolate"
 }