Expose resources in Robolectric/JUnit tests.

build/config/android/rules.gni

Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index ba8930f693bc7cfe469aecc4ccabc5382d458d2d..ec338573df32d5d99b91011fe4ab81f078eefc04 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -889,15 +889,17 @@ if (enable_java_templates) {
     resources_zip = base_path + ".resources.zip"
     build_config = base_path + ".build_config"
 
-    write_build_config("${target_name}__build_config") {
-      type = "android_resources"
-    }
-
     # Put grit files into this subdirectory of target_gen_dir.
     extra_output_path = target_name + "_grit_output"
 
     grit_target_name = "${target_name}__grit"
     grit_output_dir = "$target_gen_dir/$extra_output_path"
+
+    write_build_config("${target_name}__build_config") {
+      type = "android_resources"
+      resource_dirs = [ grit_output_dir ]

[mikecase (-- gone --), 2017/04/10 23:50:36]

@agrieve,

I looked into this a bit and am almost certain this is fine to do. But to your
knowledge, should it be ok for the java_strings_grd and
java_strings_grd_prebuilt to list off resource_dir in their build config.

It seems this pretty much just effects linting.

+    }
+
     grit(grit_target_name) {
       forward_variables_from(invoker, [ "deps" ])
       grit_flags = [
@@ -961,6 +963,7 @@ if (enable_java_templates) {
 
     write_build_config(build_config_target_name) {
       type = "android_resources"
+      resource_dirs = [ invoker.grit_output_dir ]
     }
 
     zip(zip_target_name) {
@@ -1058,11 +1061,27 @@ if (enable_java_templates) {
     _java_binary_target_name = "${target_name}__java_binary"
     _test_runner_target_name = "${target_name}__test_runner_script"
 
+    _build_config = "$target_gen_dir/$target_name.build_config"
+    _build_config_target_name = "${target_name}__build_config"
+
+    write_build_config(_build_config_target_name) {
+      type = "junit_binary"
+      build_config = _build_config
+      if (defined(invoker.deps)) {
+        possible_config_deps = invoker.deps
+      }
+    }
+
     test_runner_script(_test_runner_target_name) {
       test_name = invoker.target_name
       test_suite = invoker.target_name
       test_type = "junit"
       ignore_all_data_deps = true
+      forward_variables_from(invoker,
+                             [
+                               "android_manifest_path",
+                               "package_name",
+                             ])
     }
 
     java_binary(_java_binary_target_name) {
@@ -1082,6 +1101,7 @@ if (enable_java_templates) {
     }
     group(target_name) {
       public_deps = [
+        ":$_build_config_target_name",
         ":$_java_binary_target_name",
         ":$_test_runner_target_name",
       ]