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

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

Issue 2632463004: Android: Hook up aapt's main dex proguard rules (Closed)
Patch Set: add as input Created 3 years, 11 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/android/gyp/process_resources.py ('k') | 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 8002bc085b6c59c3f47efdcef8c26cf34d0c2883..3c0541fb0c0c2ad72ba7120f3202a8a9dd986712 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -942,6 +942,14 @@ if (enable_java_templates) {
rebase_path(main_dex_rules, root_build_dir),
]
+ if (defined(invoker.extra_main_dex_proguard_config)) {
+ inputs += [ invoker.extra_main_dex_proguard_config ]
+ args += [
+ "--main-dex-rules-path",
+ rebase_path(invoker.extra_main_dex_proguard_config, root_build_dir),
+ ]
+ }
+
if (defined(invoker.args)) {
args += invoker.args
}
@@ -2702,6 +2710,14 @@ if (enable_java_templates) {
]
}
+ if (defined(invoker.proguard_file_main_dex)) {
+ outputs += [ invoker.proguard_file_main_dex ]
+ args += [
+ "--proguard-file-main-dex",
+ rebase_path(invoker.proguard_file_main_dex, root_build_dir),
+ ]
+ }
+
if (defined(invoker.args)) {
args += invoker.args
}
« no previous file with comments | « build/android/gyp/process_resources.py ('k') | build/config/android/rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698