diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-04-07 07:33:45 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-04-07 07:33:45 +0000 |
commit | 0b2a415af0de94a5dd973a9729ac90c64592e44b (patch) | |
tree | 41848d8814d5e62af688f064c12aef317cb7ebf6 /Android.mk | |
parent | 28188020060d1ad3304dfa0367486ff5bb35da62 (diff) | |
parent | 54033c62b5b9e911d54d509b812c8a2b224510b4 (diff) |
Merge "Disable proguard optimization when not using jack"
Diffstat (limited to 'Android.mk')
-rw-r--r-- | Android.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index 9602ab8f7..02ca05ab6 100644 --- a/Android.mk +++ b/Android.mk @@ -267,7 +267,12 @@ LOCAL_PROGUARD_FLAG_FILES := \ java/com/android/dialer/proguard/proguard.flags \ java/com/android/dialer/proguard/proguard_release.flags \ java/com/android/incallui/answer/impl/proguard.flags -LOCAL_PROGUARD_ENABLED := custom optimization +LOCAL_PROGUARD_ENABLED := custom + +ifdef LOCAL_JACK_ENABLED +# Bug: 37077388 +LOCAL_PROGUARD_ENABLED += optimization +endif LOCAL_SDK_VERSION := current LOCAL_MODULE_TAGS := optional |