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..cc9515bdb1e934f8c16b178ffbf4b9d3ed7b4295 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]
+    }
+
     grit(grit_target_name) {
       forward_variables_from(invoker, [ "deps" ])
       grit_flags = [
@@ -1063,6 +1065,13 @@ if (enable_java_templates) {
       test_suite = invoker.target_name
       test_type = "junit"
       ignore_all_data_deps = true
+      forward_variables_from(invoker,
+                             [
+                               "android_manifest_path",
+                               # "resource_dirs",
+                               "resource_deps",
+                               "package_name",
+                             ])
     }
 
     java_binary(_java_binary_target_name) {