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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2101033002: Remove proguard specific override block (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added assert to keep constraint Created 4 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 | 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 4cb5b4d6bce6cdba26e10600cd815ca603f9fd11..a0913a5261c9997c891435d68d2ba8d21bf0f915 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -2327,11 +2327,8 @@ if (enable_java_templates) {
forward_variables_from(invoker, "*")
testonly = true
- if (defined(invoker.proguard_enabled) && invoker.proguard_enabled) {
- assert(invoker.proguard_configs != [])
- proguard_enabled = true
- proguard_configs = invoker.proguard_configs
- }
+ assert(!defined(invoker.proguard_enabled) || !invoker.proguard_enabled
+ || invoker.proguard_configs != [])
if (!defined(apk_name)) {
apk_name = get_label_info(invoker.shared_library, "name")
« 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