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

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

Issue 2840533003: [android] Make main_dex_list.py use the same proguard as everything else. (Closed)
Patch Set: remove unused constant Created 3 years, 8 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/pylib/constants/__init__.py ('k') | no next file » | 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 e4a4e2d1f6fc59e6ee3bef81c3e738ba0de107da..8cc247bb59c17c64b87d34965a347bd890302573 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -41,6 +41,8 @@ _java_target_blacklist = [
"*:*_unpack_aar",
]
+_default_proguard_jar_path = "//third_party/proguard/lib/proguard.jar"
+
# Write the target's .build_config file. This is a json file that contains a
# dictionary of information about how to build this target (things that
# require knowledge about this target's dependencies and cannot be calculated
@@ -762,7 +764,7 @@ if (enable_java_templates) {
if (defined(invoker.proguard_jar_path)) {
_proguard_jar_path = invoker.proguard_jar_path
} else {
- _proguard_jar_path = "//third_party/proguard/lib/proguard.jar"
+ _proguard_jar_path = _default_proguard_jar_path
}
_output_jar_path = invoker.output_jar_path
inputs = [
@@ -938,10 +940,19 @@ if (enable_java_templates) {
main_dex_rules = "//build/android/main_dex_classes.flags"
+ if (defined(invoker.proguard_jar_path)) {
+ _proguard_jar_path = invoker.proguard_jar_path
+ } else {
+ _proguard_jar_path = _default_proguard_jar_path
+ }
+
if (!defined(inputs)) {
inputs = []
}
- inputs += [ main_dex_rules ]
+ inputs += [
+ main_dex_rules,
+ _proguard_jar_path,
+ ]
outputs = [
_main_dex_list_path,
@@ -956,6 +967,8 @@ if (enable_java_templates) {
rebase_path(_main_dex_list_path, root_build_dir),
"--main-dex-rules-path",
rebase_path(main_dex_rules, root_build_dir),
+ "--proguard-path",
+ rebase_path(_proguard_jar_path, root_build_dir),
]
if (defined(invoker.extra_main_dex_proguard_config)) {
« no previous file with comments | « build/android/pylib/constants/__init__.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698