Move java_strings_grd() template into grit_rule.gni

Build rules in //build should not reference things outside of //build.
java_strings_grd() was breaking this rule, and so I'm fixing it here by
moving it to live alongside the other grit() templates.

Bug: 1136507
Change-Id: I575c8e6636a86602b8c3eee557ce990e7fa00eaa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2477093Reviewed-by: Peter Kotwicz <pkotwicz@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#818451}

build/config/android/rules.gni

@@ -122,7 +122,6 @@ template("create_native_executable_dist") {
 
 if (enable_java_templates) {
   import("//build/config/sanitizers/sanitizers.gni")
-  import("//tools/grit/grit_rule.gni")
 
   # JNI target implementation. See generate_jni or generate_jar_jni for usage.
   template("generate_jni_impl") {
@@ -1258,102 +1257,6 @@ if (enable_java_templates) {
     }
   }
 
-  # Declare a target that generates localized strings.xml from a .grd file.
-  #
-  # If this target is included in the deps of an android resources/library/apk,
-  # the strings.xml will be included with that target.
-  #
-  # Variables
-  #   deps: Specifies the dependencies of this target.
-  #   grd_file: Path to the .grd file to generate strings.xml from.
-  #   outputs: Expected grit outputs (see grit rule).
-  #
-  # Example
-  #  java_strings_grd("foo_strings_grd") {
-  #    grd_file = "foo_strings.grd"
-  #  }
-  template("java_strings_grd") {
-    forward_variables_from(invoker, [ "testonly" ])
-
-    _resources_zip = "$target_out_dir/$target_name.resources.zip"
-    _grit_target_name = "${target_name}__grit"
-    _grit_output_dir = "$target_gen_dir/${target_name}_grit_output"
-
-    grit(_grit_target_name) {
-      forward_variables_from(invoker,
-                             [
-                               "deps",
-                               "defines",
-                             ])
-      grit_flags = [
-        "-E",
-        "ANDROID_JAVA_TAGGED_ONLY=false",
-      ]
-      output_dir = _grit_output_dir
-      resource_ids = ""
-      source = invoker.grd_file
-      outputs = invoker.outputs
-    }
-
-    _zip_target_name = "${target_name}__zip"
-
-    zip(_zip_target_name) {
-      base_dir = _grit_output_dir
-
-      # This needs to get outputs from grit's internal target, not the final
-      # source_set.
-      inputs = filter_exclude(get_target_outputs(":${_grit_target_name}_grit"),
-                              [ "*.stamp" ])
-      output = _resources_zip
-      deps = [ ":$_grit_target_name" ]
-    }
-
-    android_generated_resources(target_name) {
-      generating_target_name = ":$_zip_target_name"
-      generated_resources_zip = _resources_zip
-    }
-  }
-
-  # Declare a target that packages strings.xml generated from a grd file.
-  #
-  # If this target is included in the deps of an android resources/library/apk,
-  # the strings.xml will be included with that target.
-  #
-  # Variables
-  #  grit_output_dir: directory containing grit-generated files.
-  #  generated_files: list of android resource files to package.
-  #
-  # Example
-  #  java_strings_grd_prebuilt("foo_strings_grd") {
-  #    grit_output_dir = "$root_gen_dir/foo/grit"
-  #    generated_files = [
-  #      "values/strings.xml"
-  #    ]
-  #  }
-  template("java_strings_grd_prebuilt") {
-    forward_variables_from(invoker, [ "testonly" ])
-
-    _resources_zip = "$target_out_dir/$target_name.resources.zip"
-    _zip_target_name = "${target_name}__zip"
-
-    zip(_zip_target_name) {
-      forward_variables_from(invoker, [ "visibility" ])
-
-      base_dir = invoker.grit_output_dir
-      inputs = rebase_path(invoker.generated_files, ".", base_dir)
-      output = _resources_zip
-      if (defined(invoker.deps)) {
-        deps = invoker.deps
-      }
-    }
-
-    android_generated_resources(target_name) {
-      forward_variables_from(invoker, [ "resource_overlay" ])
-      generating_target_name = ":$_zip_target_name"
-      generated_resources_zip = _resources_zip
-    }
-  }
-
   # Declare a Java executable target
   #
   # Same as java_library, but also creates a wrapper script within

chrome/android/features/autofill_assistant/BUILD.gn

@@ -6,6 +6,7 @@ import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build/config/locales.gni")
 import("//chrome/common/features.gni")
+import("//tools/grit/grit_rule.gni")
 
 # The animated_poodle_java target is overridden downstream and used
 # instead of this one if the enable_chrome_android_internal flag is

chrome/android/features/keyboard_accessory/internal/BUILD.gn

@@ -5,6 +5,7 @@
 import("//build/config/android/rules.gni")
 import("//build/config/locales.gni")
 import("//chrome/common/features.gni")
+import("//tools/grit/grit_rule.gni")
 
 android_library("internal_java") {
   deps = [

chrome/android/features/start_surface/internal/BUILD.gn

@@ -6,6 +6,7 @@ import("//build/config/android/rules.gni")
 import("//build/config/locales.gni")
 import("//chrome/common/features.gni")
 import("//components/feed/features.gni")
+import("//tools/grit/grit_rule.gni")
 
 java_strings_grd("java_strings_grd") {
   defines = chrome_grit_defines

chrome/android/features/tab_ui/BUILD.gn

@@ -7,6 +7,7 @@ import("//build/config/locales.gni")
 import("//chrome/android/features/tab_ui/buildflags.gni")
 import("//chrome/common/features.gni")
 import("//components/module_installer/android/module_desc_java.gni")
+import("//tools/grit/grit_rule.gni")
 
 java_strings_grd("java_strings_grd") {
   defines = chrome_grit_defines

chrome/android/features/vr/BUILD.gn

@@ -6,6 +6,7 @@ import("//build/config/android/rules.gni")
 import("//build/config/locales.gni")
 import("//chrome/common/features.gni")
 import("//device/vr/buildflags/buildflags.gni")
+import("//tools/grit/grit_rule.gni")
 
 assert(enable_vr)
 

chrome/android/webapk/shell_apk/BUILD.gn

@@ -4,6 +4,7 @@
 
 import("//build/config/android/rules.gni")
 import("//build/config/locales.gni")
+import("//tools/grit/grit_rule.gni")
 import("current_version/current_version.gni")
 import("generate_manifest_for_upload_outputs.gni")
 import("mustache_pass.gni")

chrome/browser/BUILD.gn

@@ -35,6 +35,7 @@ import("//third_party/blink/public/public_features.gni")
 import("//third_party/protobuf/proto_library.gni")
 import("//third_party/webrtc/webrtc.gni")
 import("//third_party/widevine/cdm/widevine.gni")
+import("//tools/grit/grit_rule.gni")
 import("//ui/base/ui_features.gni")
 
 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which
@@ -42,8 +43,6 @@ import("//ui/base/ui_features.gni")
 if (is_android) {
   import("//build/config/android/rules.gni")
   import("//chrome/android/features/dev_ui/dev_ui_module.gni")
-} else {
-  import("//tools/grit/grit_rule.gni")
 }
 
 if (is_win) {

chrome/browser/password_check/android/internal/BUILD.gn

@@ -6,6 +6,7 @@ import("//build/config/android/rules.gni")
 import("//build/config/locales.gni")
 import("//chrome/android/features/android_library_factory_tmpl.gni")
 import("//chrome/common/features.gni")
+import("//tools/grit/grit_rule.gni")
 
 _factory_sources = [ "java/src/org/chromium/chrome/browser/password_check/PasswordCheckFactory.java" ]
 _public_target = "//chrome/browser/password_check/android:public_java"

chrome/browser/touch_to_fill/android/internal/BUILD.gn

@@ -5,6 +5,7 @@
 import("//build/config/android/rules.gni")
 import("//build/config/locales.gni")
 import("//chrome/common/features.gni")
+import("//tools/grit/grit_rule.gni")
 
 android_library("java") {
   deps = [

chrome/browser/ui/android/strings/BUILD.gn

@@ -2,9 +2,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/android/rules.gni")
 import("//build/config/locales.gni")
 import("//chrome/common/features.gni")
+import("//tools/grit/grit_rule.gni")
 
 java_strings_grd("ui_strings_grd") {
   defines = chrome_grit_defines

components/autofill/android/BUILD.gn

@@ -4,6 +4,7 @@
 
 import("//build/config/android/rules.gni")
 import("//build/config/locales.gni")
+import("//tools/grit/grit_rule.gni")
 
 java_strings_grd("autofill_strings_grd") {
   grd_file = "java/strings/autofill_strings.grd"

components/browser_ui/strings/android/BUILD.gn

@@ -2,8 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/android/rules.gni")
 import("//build/config/locales.gni")
+import("//tools/grit/grit_rule.gni")
 
 java_strings_grd("browser_ui_strings_grd") {
   grd_file = "browser_ui_strings.grd"

components/embedder_support/android/BUILD.gn

@@ -4,6 +4,7 @@
 
 import("//build/config/android/rules.gni")
 import("//build/config/locales.gni")
+import("//tools/grit/grit_rule.gni")
 
 android_library("browser_context_java") {
   sources = [ "java/src/org/chromium/components/embedder_support/browser_context/BrowserContextHandle.java" ]

components/javascript_dialogs/android/BUILD.gn

@@ -4,6 +4,7 @@
 
 import("//build/config/android/rules.gni")
 import("//build/config/locales.gni")
+import("//tools/grit/grit_rule.gni")
 
 android_library("java") {
   sources = [

components/media_router/browser/android/BUILD.gn

@@ -5,6 +5,7 @@
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build/config/locales.gni")
+import("//tools/grit/grit_rule.gni")
 
 android_library("java") {
   resources_package = "org.chromium.components.media_router"

components/permissions/android/BUILD.gn

@@ -4,6 +4,7 @@
 
 import("//build/config/android/rules.gni")
 import("//build/config/locales.gni")
+import("//tools/grit/grit_rule.gni")
 
 generate_jni("jni_headers") {
   sources = [

content/public/android/BUILD.gn

@@ -6,6 +6,7 @@ import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build/config/locales.gni")
 import("//device/vr/buildflags/buildflags.gni")
+import("//tools/grit/grit_rule.gni")
 
 android_aidl("common_aidl") {
   interface_file = "java/src/org/chromium/content/common/common.aidl"

remoting/resources/BUILD.gn

@@ -5,10 +5,6 @@
 import("//remoting/remoting_locales.gni")
 import("//tools/grit/grit_rule.gni")
 
-if (is_android) {
-  import("//build/config/android/rules.gni")
-}
-
 group("resources") {
   public_deps = [
     ":copy_locales",

tools/grit/grit_rule.gni

@@ -342,3 +342,110 @@ template("grit") {
     output_name = _grit_output_name
   }
 }
+
+if (is_android) {
+  import("//build/config/android/rules.gni")
+
+  # Declare a target that generates localized strings.xml from a .grd file.
+  #
+  # If this target is included in the deps of an android resources/library/apk,
+  # the strings.xml will be included with that target.
+  #
+  # Variables
+  #   deps: Specifies the dependencies of this target.
+  #   grd_file: Path to the .grd file to generate strings.xml from.
+  #   outputs: Expected grit outputs (see grit rule).
+  #
+  # Example
+  #  java_strings_grd("foo_strings_grd") {
+  #    grd_file = "foo_strings.grd"
+  #  }
+  template("java_strings_grd") {
+    forward_variables_from(invoker, [ "testonly" ])
+
+    _resources_zip = "$target_out_dir/$target_name.resources.zip"
+    _grit_target_name = "${target_name}__grit"
+    _grit_output_dir = "$target_gen_dir/${target_name}_grit_output"
+
+    grit(_grit_target_name) {
+      forward_variables_from(invoker,
+                             [
+                               "deps",
+                               "defines",
+                             ])
+      grit_flags = [
+        "-E",
+        "ANDROID_JAVA_TAGGED_ONLY=false",
+      ]
+      output_dir = _grit_output_dir
+      resource_ids = ""
+      source = invoker.grd_file
+      outputs = invoker.outputs
+    }
+
+    _zip_target_name = "${target_name}__zip"
+
+    zip(_zip_target_name) {
+      base_dir = _grit_output_dir
+
+      # This needs to get outputs from grit's internal target, not the final
+      # source_set.
+      inputs = filter_exclude(get_target_outputs(":${_grit_target_name}_grit"),
+                              [ "*.stamp" ])
+      output = _resources_zip
+      deps = [ ":$_grit_target_name" ]
+    }
+
+    android_generated_resources(target_name) {
+      forward_variables_from(invoker,
+                             [
+                               "resource_overlay",
+                               "visibility",
+                             ])
+      generating_target_name = ":$_zip_target_name"
+      generated_resources_zip = _resources_zip
+    }
+  }
+
+  # Declare a target that packages strings.xml generated from a grd file.
+  #
+  # If this target is included in the deps of an android resources/library/apk,
+  # the strings.xml will be included with that target.
+  #
+  # Variables
+  #  grit_output_dir: directory containing grit-generated files.
+  #  generated_files: list of android resource files to package.
+  #
+  # Example
+  #  java_strings_grd_prebuilt("foo_strings_grd") {
+  #    grit_output_dir = "$root_gen_dir/foo/grit"
+  #    generated_files = [
+  #      "values/strings.xml"
+  #    ]
+  #  }
+  template("java_strings_grd_prebuilt") {
+    forward_variables_from(invoker, [ "testonly" ])
+
+    _resources_zip = "$target_out_dir/$target_name.resources.zip"
+    _zip_target_name = "${target_name}__zip"
+
+    zip(_zip_target_name) {
+      base_dir = invoker.grit_output_dir
+      inputs = rebase_path(invoker.generated_files, ".", base_dir)
+      output = _resources_zip
+      if (defined(invoker.deps)) {
+        deps = invoker.deps
+      }
+    }
+
+    android_generated_resources(target_name) {
+      forward_variables_from(invoker,
+                             [
+                               "resource_overlay",
+                               "visibility",
+                             ])
+      generating_target_name = ":$_zip_target_name"
+      generated_resources_zip = _resources_zip
+    }
+  }
+}

ui/android/BUILD.gn

@@ -5,6 +5,7 @@
 import("//build/config/android/rules.gni")
 import("//build/config/locales.gni")
 import("//testing/test.gni")
+import("//tools/grit/grit_rule.gni")
 
 assert(is_android)
 

weblayer/browser/java/BUILD.gn

@@ -5,6 +5,7 @@
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build/config/locales.gni")
+import("//tools/grit/grit_rule.gni")
 import("//weblayer/variables.gni")
 
 _bundle_utils_output =