Revert of (Reland x2) Expose resources in Robolectric/JUnit tests.

build/config/android/rules.gni

 # 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.
 
 # Do not add any imports to non-//build directories here.
 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in.
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/dcheck_always_on.gni")
@@ skipping 561 matching lines @@
   #     variables = ["color=red"]
   #   }
   template("jinja_template_resources") {
     set_sources_assignment_filter([])
     forward_variables_from(invoker, [ "testonly" ])
 
     assert(defined(invoker.resources))
     assert(defined(invoker.res_dir))
 
     _base_path = "$target_gen_dir/$target_name"
-
-    # JUnit tests use resource zip files. These must not be put in gen/
-    # directory or they will not be available to tester bots.
-    _resources_zip = "${target_out_dir}/${target_name}.resources.zip"
+    _resources_zip = _base_path + ".resources.zip"
     _build_config = _base_path + ".build_config"
 
     write_build_config("${target_name}__build_config") {
       build_config = _build_config
       resources_zip = _resources_zip
       type = "android_resources"
       if (defined(invoker.deps)) {
         possible_config_deps = invoker.deps
       }
     }
@@ skipping 76 matching lines @@
   #     deps = [":foo_resources"]
   #     resource_dirs = ["res_overrides"]
   #   }
   template("android_resources") {
     set_sources_assignment_filter([])
     forward_variables_from(invoker, [ "testonly" ])
 
     assert(defined(invoker.resource_dirs))
 
     base_path = "$target_gen_dir/$target_name"
-
-    # JUnit tests use resource zip files. These must not be put in gen/
-    # directory or they will not be available to tester bots.
-    zip_path = "${target_out_dir}/${target_name}.resources.zip"
+    zip_path = base_path + ".resources.zip"
     srcjar_path = base_path + ".srcjar"
     r_text_out_path = base_path + "_R.txt"
     build_config = base_path + ".build_config"
 
     build_config_target_name = "${target_name}__build_config"
     process_resources_target_name = "${target_name}__process_resources"
     final_target_name = target_name
 
     write_build_config(build_config_target_name) {
       type = "android_resources"
@@ skipping 198 matching lines @@
   #
   # Example
   #  java_strings_grd("foo_strings_grd") {
   #    grd_file = "foo_strings.grd"
   #  }
   template("java_strings_grd") {
     set_sources_assignment_filter([])
     forward_variables_from(invoker, [ "testonly" ])
 
     base_path = "$target_gen_dir/$target_name"
-
-    # JUnit tests use resource zip files. These must not be put in gen/
-    # directory or they will not be available to tester bots.
-    resources_zip = "${target_out_dir}/${target_name}.resources.zip"
+    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"
-
     grit(grit_target_name) {
       forward_variables_from(invoker, [ "deps" ])
       grit_flags = [
         "-E",
         "ANDROID_JAVA_TAGGED_ONLY=false",
       ]
       output_dir = grit_output_dir
       resource_ids = ""
       source = invoker.grd_file
       outputs = invoker.outputs
@@ skipping 34 matching lines @@
   #    grit_output_dir = "$root_gen_dir/foo/grit"
   #    generated_files = [
   #      "values/strings.xml"
   #    ]
   #  }
   template("java_strings_grd_prebuilt") {
     set_sources_assignment_filter([])
     forward_variables_from(invoker, [ "testonly" ])
 
     base_path = "$target_gen_dir/$target_name"
-
-    # JUnit tests use resource zip files. These must not be put in gen/
-    # directory or they will not be available to tester bots.
-    resources_zip = "${target_out_dir}/${target_name}.resources.zip"
+    resources_zip = base_path + ".resources.zip"
     build_config = base_path + ".build_config"
 
     build_config_target_name = "${target_name}__build_config"
     zip_target_name = "${target_name}__zip"
     final_target_name = target_name
 
     write_build_config(build_config_target_name) {
       type = "android_resources"
     }
 
@@ skipping 85 matching lines @@
   #     java_files = [ "org/chromium/foo/FooTest.java" ]
   #     deps = [ ":bar_java" ]
   #   }
   template("junit_binary") {
     set_sources_assignment_filter([])
     testonly = true
 
     _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) {
       deps = []
       output_name = invoker.target_name
       forward_variables_from(invoker, "*")
       testonly = true
       bypass_platform_checks = true
       main_class = "org.chromium.testing.local.JunitTestMain"
       wrapper_script_name = "helper/$target_name"
       deps += [
         "//testing/android/junit:junit_test_support",
         "//third_party/junit",
         "//third_party/mockito:mockito_java",
         "//third_party/robolectric:robolectric_all_java",
       ]
     }
     group(target_name) {
       public_deps = [
-        ":$_build_config_target_name",
         ":$_java_binary_target_name",
         ":$_test_runner_target_name",
       ]
     }
   }
 
   # Declare a java library target
   #
   # Variables
   #   deps: Specifies the dependencies of this target. Java targets in this list
@@ skipping 405 matching lines @@
   #   }
   template("android_apk") {
     set_sources_assignment_filter([])
     forward_variables_from(invoker, [ "testonly" ])
 
     assert(defined(invoker.final_apk_path) || defined(invoker.apk_name))
     assert(defined(invoker.android_manifest))
     gen_dir = "$target_gen_dir/$target_name"
     base_path = "$gen_dir/$target_name"
     _build_config = "$target_gen_dir/$target_name.build_config"
-
-    # JUnit tests use resource zip files. These must not be put in gen/
-    # directory or they will not be available to tester bots.
-    resources_zip_path = "${target_out_dir}/${target_name}.resources.zip"
+    resources_zip_path = "$base_path.resources.zip"
     _all_resources_zip_path = "$base_path.resources.all.zip"
     _jar_path = "$base_path.jar"
     _lib_dex_path = "$base_path.dex.jar"
     _rebased_lib_dex_path = rebase_path(_lib_dex_path, root_build_dir)
     _template_name = target_name
     if (defined(invoker.java_files)) {
       _java_sources_file = "$base_path.sources"
     }
 
     enable_multidex =
@@ skipping 1386 matching lines @@
         # because in practice they seem to contain classes required to be in the
         # classpath.
         deps += _subjar_targets
       }
       if (defined(_res_target_name)) {
         deps += [ ":$_res_target_name" ]
       }
     }
   }
 }