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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/config/android/rules.gni

Issue 758473002: Fix some android configuration (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: also fix unittest datadeps Created 6 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 | « build/config/android/config.gni ('k') | chrome/test/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 5d0cb372388f729608e30c4c27e8dec2b8415e0d..f7ae82fa82bdafa206708ac8f1cb80135b9c1881 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1399,8 +1399,7 @@ template("android_apk") {
group(target_name) {
deps = final_deps
if (defined(invoker.datadeps)) {
- # TODO(cjhopman): Fix this when group datadeps works.
- deps += invoker.datadeps
+ datadeps = invoker.datadeps
}
}
}
@@ -1455,6 +1454,9 @@ template("unittest_apk") {
"//tools/android/forwarder2",
"//tools/android/md5sum",
]
+ if (defined(invoker.datadeps)) {
+ datadeps += invoker.datadeps
+ }
}
}
« no previous file with comments | « build/config/android/config.gni ('k') | chrome/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698