Chromium Code Reviews| Index: build/config/android/internal_rules.gni |
| diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni |
| index e4a4e2d1f6fc59e6ee3bef81c3e738ba0de107da..609feba94caad74c72755fc2d788734878c07fc7 100644 |
| --- a/build/config/android/internal_rules.gni |
| +++ b/build/config/android/internal_rules.gni |
| @@ -87,7 +87,7 @@ template("write_build_config") { |
| type == "android_resources" || type == "deps_dex" || |
| type == "dist_jar" || type == "android_assets" || |
| type == "resource_rewriter" || type == "java_binary" || |
| - type == "group" || type == "java_prebuilt") |
| + type == "group" || type == "java_prebuilt" || type == "junit_binary") |
| forward_variables_from(invoker, |
| [ |
| @@ -564,10 +564,40 @@ template("test_runner_script") { |
| } |
| } 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" ] |
|
jbudorick
2017/04/11 19:55:05
Do these 8 lines need to be in the invoker.package
mikecase (-- gone --)
2017/04/11 21:30:53
So, technically no. But the way things are current
|
| + _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", |