Revert of Expose resources in Robolectric/JUnit tests.

build/config/android/internal_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_overrides/build.gni")
 import("//build/config/android/config.gni")
 import("//build/config/dcheck_always_on.gni")
 import("//build/config/sanitizers/sanitizers.gni")
@@ skipping 69 matching lines @@
   }
 
   action(target_name) {
     set_sources_assignment_filter([])
     build_config = invoker.build_config
 
     assert(type == "android_apk" || type == "java_library" ||
            type == "android_resources" || type == "deps_dex" ||
            type == "dist_jar" || type == "android_assets" ||
            type == "resource_rewriter" || type == "java_binary" ||
-           type == "group" || type == "java_prebuilt" || type == "junit_binary")
+           type == "group" || type == "java_prebuilt")
 
     forward_variables_from(invoker,
                            [
                              "deps",
                              "testonly",
                            ])
     if (!defined(deps)) {
       deps = []
     }
 
@@ skipping 456 matching lines @@
       if (emma_coverage) {
         # Set a default coverage output directory (can be overridden by user
         # passing the same flag).
         test_runner_args += [
           "--coverage-dir",
           rebase_path("$root_out_dir/coverage", root_build_dir),
         ]
       }
     } else if (_test_type == "junit") {
       assert(defined(invoker.test_suite))
-
       test_runner_args += [
         "--test-suite",
         invoker.test_suite,
       ]
-      if (defined(invoker.android_manifest_path)) {
-        test_runner_args += [
-          "--android-manifest-path",
-          rebase_path(invoker.android_manifest_path, root_build_dir),
-        ]
-      }
-
-      if (defined(invoker.package_name)) {
-        test_runner_args += [
-          "--package-name",
-          invoker.package_name,
-        ]
-
-        deps += [ ":${invoker.test_suite}__build_config" ]
-        _junit_binary_build_config =
-            "${target_gen_dir}/${invoker.test_suite}.build_config"
-        _rebased_build_config =
-            rebase_path("$_junit_binary_build_config", root_build_dir)
-        test_runner_args += [
-          "--resource-zips",
-          "@FileArg($_rebased_build_config:resources:dependency_zips)",
-        ]
-      }
-
-      test_runner_args += [
-        "--robolectric-runtime-deps-dir",
-        rebase_path("$root_build_dir/lib.java/third_party/robolectric",
-                    root_build_dir),
-      ]
     } else if (_test_type == "linker") {
       test_runner_args += [
         "--test-apk",
         "@FileArg($_rebased_apk_build_config:deps_info:apk_path)",
       ]
     } else {
       assert(false, "Invalid test type: $_test_type.")
     }
 
     if (defined(invoker.additional_apks)) {
@@ skipping 2196 matching lines @@
         rebase_path(root_build_dir, root_build_dir),
         "--packed-libraries-dir",
         rebase_path(_packed_libraries_dir, root_build_dir),
         "--libraries=${invoker.libraries_filearg}",
         "--filelistjson",
         rebase_path(invoker.file_list_json, root_build_dir),
       ]
     }
   }
 }