Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Unified Diff: components/BUILD.gn

Issue 1465923002: GN: Merge apk_deps and deps in test() template (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: for realz this time Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/BUILD.gn ('k') | components/html_viewer/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/BUILD.gn
diff --git a/components/BUILD.gn b/components/BUILD.gn
index c032af80861cf42c92dc75c573d92d18abfc2cbf..fa9fe7ae08cffc1bb03d1519aa2d0d44f17a1ecd 100644
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -490,26 +490,23 @@ test("components_unittests") {
deps += [
"//components/invalidation/impl",
+ "//components/invalidation/impl:java",
"//components/safe_json",
+ "//components/safe_json/android:safe_json_java",
"//components/signin/core/browser",
+ "//components/signin/core/browser/android:java",
+ "//components/variations/android:variations_java",
+ "//content/public/android:content_java",
"//content/public/android:content_java",
"//content/public/browser",
"//net",
+ "//ui/android:ui_java",
"//ui/base",
"//ui/gfx",
]
- apk_deps = [
- "//components/invalidation/impl:java",
- "//components/safe_json/android:safe_json_java",
- "//components/signin/core/browser/android:java",
- "//components/variations/android:variations_java",
- "//content/public/android:content_java",
- "//ui/android:ui_java",
- ]
-
if (enable_configuration_policy) {
- apk_deps += [ "//components/policy/android:policy_java" ]
+ deps += [ "//components/policy/android:policy_java" ]
}
}
@@ -702,7 +699,7 @@ test("components_browsertests") {
isolate_file = "components_browsertests.isolate"
android_manifest =
"${target_gen_dir}/components_browsertests_manifest/AndroidManifest.xml"
- apk_deps = [
+ deps += [
":components_browsertests_assets",
":components_browsertests_java",
":components_browsertests_manifest",
« no previous file with comments | « chrome/test/BUILD.gn ('k') | components/html_viewer/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698