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

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

Issue 2541763003: [GN] Add support for generated proguard configs in android_apk (Closed)
Patch Set: Returned forwarding of "deps" back Created 4 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 | « no previous file | 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 2cc550bc3dade4091a87d0af802e73299303dd0f..3e9c66bc4d91e1afc5bfde64397a99024b7cd74c 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1834,9 +1834,13 @@ if (enable_java_templates) {
forward_variables_from(invoker,
[
"alternative_android_sdk_jar",
+ "deps",
"proguard_jar_path",
])
- deps = [
+ if (!defined(deps)) {
+ deps = []
+ }
+ deps += [
":$build_config_target",
":$java_target",
":$process_resources_target",
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698