Commit 90164da9 authored by Alexander Cooper's avatar Alexander Cooper Committed by Commit Bot

Revert "Remove native deps from chrome_junit_tests"

This reverts commit 4b1723f2.

Reason for revert:crbug.com/1035586

Original change's description:
> 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/+/1953400
> Reviewed-by: Peter Wen <wnwen@chromium.org>
> Reviewed-by: Matt Reynolds <mattreynolds@chromium.org>
> Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#723080}

TBR=wnwen@chromium.org,agrieve@chromium.org,mattreynolds@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: None
Change-Id: I5f5d1e67637e6aa4d1008b8227c84ce114bcf867
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1974586Reviewed-by: default avatarAlexander Cooper <alcooper@chromium.org>
Commit-Queue: Alexander Cooper <alcooper@chromium.org>
Cr-Commit-Position: refs/heads/master@{#726168}
parent c08ecf11
......@@ -3514,7 +3514,6 @@ if (enable_java_templates) {
generate_interface_jar(target_name) {
forward_variables_from(invoker,
[
"assert_no_deps",
"data",
"data_deps",
"deps",
......@@ -3577,7 +3576,6 @@ if (enable_java_templates) {
group(target_name) {
forward_variables_from(invoker,
[
"assert_no_deps",
"data",
"deps",
"data_deps",
......
......@@ -1454,7 +1454,6 @@ if (enable_java_templates) {
}
group(target_name) {
forward_variables_from(invoker, [ "assert_no_deps" ])
public_deps = [
":$_build_config_target_name",
":$_java_binary_target_name",
......
......@@ -623,11 +623,6 @@ junit_binary("chrome_junit_tests") {
# From java_sources.gni.
java_files = chrome_junit_test_java_sources
assert_no_deps = [
"//content",
"//mojo/public/mojom/base",
]
deps = [
":app_hooks_java",
":chrome_app_java_resources",
......
......@@ -149,6 +149,7 @@ if (is_android) {
]
deps = [
":geolocation",
":geolocation_jni_headers",
"$google_play_services_package:google_play_services_base_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