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

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

Issue 1217583002: Fix GN build errors when splits are enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add parameter docs Created 5 years, 6 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 | « no previous file | build/config/android/rules.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/internal_rules.gni
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index a8da93af28e09172a6b459d1559a9ef9131f46ed..b864dd54f2656b70a3795e0ac72e6f6423c58cca 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -790,6 +790,9 @@ template("create_apk") {
keystore_path = _keystore_path
keystore_name = _keystore_name
keystore_password = _keystore_password
+ deps = [
+ ":${_package_resources_target_name}",
+ ]
}
}
@@ -1476,6 +1479,9 @@ template("generate_split_manifest") {
action(target_name) {
depfile = "$target_gen_dir/$target_name.d"
+ if (defined(invoker.deps)) {
+ deps = invoker.deps
+ }
args = [
"--main-manifest",
rebase_path(invoker.main_manifest, root_build_dir),
« no previous file with comments | « no previous file | build/config/android/rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698