Commit 4b1723f2 authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

Remove native deps from chrome_junit_tests

And adds an "assert_no_deps" to prevent regressions.
Would be nice to assert that the junit target does not depend on //base,
but it looks like all grit targets depend on //base, and fixing that
would require a larger refactor.

Bug: None
Change-Id: I970cdb458d50a32f55165756a10e66857470d75a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1953400Reviewed-by: default avatarPeter Wen <wnwen@chromium.org>
Reviewed-by: default avatarMatt Reynolds <mattreynolds@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#723080}
parent d7e32b90
...@@ -3509,6 +3509,7 @@ if (enable_java_templates) { ...@@ -3509,6 +3509,7 @@ if (enable_java_templates) {
generate_interface_jar(target_name) { generate_interface_jar(target_name) {
forward_variables_from(invoker, forward_variables_from(invoker,
[ [
"assert_no_deps",
"data", "data",
"data_deps", "data_deps",
"deps", "deps",
...@@ -3571,6 +3572,7 @@ if (enable_java_templates) { ...@@ -3571,6 +3572,7 @@ if (enable_java_templates) {
group(target_name) { group(target_name) {
forward_variables_from(invoker, forward_variables_from(invoker,
[ [
"assert_no_deps",
"data", "data",
"deps", "deps",
"data_deps", "data_deps",
......
...@@ -1450,6 +1450,7 @@ if (enable_java_templates) { ...@@ -1450,6 +1450,7 @@ if (enable_java_templates) {
} }
group(target_name) { group(target_name) {
forward_variables_from(invoker, [ "assert_no_deps" ])
public_deps = [ public_deps = [
":$_build_config_target_name", ":$_build_config_target_name",
":$_java_binary_target_name", ":$_java_binary_target_name",
......
...@@ -616,6 +616,11 @@ junit_binary("chrome_junit_tests") { ...@@ -616,6 +616,11 @@ junit_binary("chrome_junit_tests") {
# From java_sources.gni. # From java_sources.gni.
java_files = chrome_junit_test_java_sources java_files = chrome_junit_test_java_sources
assert_no_deps = [
"//content",
"//mojo/public/mojom/base",
]
deps = [ deps = [
":app_hooks_java", ":app_hooks_java",
":chrome_app_java_resources", ":chrome_app_java_resources",
......
...@@ -149,7 +149,6 @@ if (is_android) { ...@@ -149,7 +149,6 @@ if (is_android) {
] ]
deps = [ deps = [
":geolocation",
":geolocation_jni_headers", ":geolocation_jni_headers",
"$google_play_services_package:google_play_services_base_java", "$google_play_services_package:google_play_services_base_java",
"$google_play_services_package:google_play_services_basement_java", "$google_play_services_package:google_play_services_basement_java",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment