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

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

Issue 1702663002: Reland of Make instrumentation_test_apk depend on their apk_under_test. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dist-jar
Patch Set: fix Created 4 years, 10 months 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/internal_rules.gni ('k') | no next file » | 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 30f42bc4217b8e257338c150816658a957ce4fde..e49daf6c2d1abf6e1ba2e33ca706fafdb226a3fd 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1557,6 +1557,9 @@ template("android_apk") {
if (defined(invoker.deps)) {
deps += invoker.deps
}
+ if (defined(invoker.apk_under_test)) {
+ deps += [ "${invoker.apk_under_test}__java" ]
+ }
}
# TODO(cjhopman): This is only ever needed to calculate the list of tests to
@@ -1612,12 +1615,23 @@ template("android_apk") {
] + _proguard_configs
output_jar_path = _proguard_jar_path
- rebased_proguard_configs = rebase_path(_proguard_configs, root_build_dir)
+ _rebased_proguard_configs = rebase_path(_proguard_configs, root_build_dir)
args = [
- "--proguard-configs=$rebased_proguard_configs",
- "--tested-apk-info=@FileArg($_rebased_build_config:proguard:tested_apk_info)",
+ "--proguard-configs=$_rebased_proguard_configs",
"--input-paths=@FileArg($_rebased_build_config:proguard:input_paths)",
]
+ if (defined(invoker.apk_under_test)) {
+ deps += [
+ "${invoker.apk_under_test}__build_config",
+ "${invoker.apk_under_test}__proguard",
+ ]
+ _apk_under_test_build_config =
+ get_label_info(invoker.apk_under_test, "target_gen_dir") + "/" +
+ get_label_info(invoker.apk_under_test, "name") + ".build_config"
+ _rebased_apk_under_test_build_config =
+ rebase_path(_apk_under_test_build_config, root_build_dir)
+ args += [ "--tested-apk-info=@FileArg($_rebased_apk_under_test_build_config:deps_info:proguard_info)" ]
+ }
}
_dex_sources = [ _proguard_jar_path ]
_dex_deps = [ ":$_proguard_target" ]
« no previous file with comments | « build/config/android/internal_rules.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698