diff options
| author | Colin Cross <ccross@android.com> | 2017-04-12 01:06:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-12 01:06:59 +0000 |
| commit | c5f46d396c4505d5cf38c90603089e918977682f (patch) | |
| tree | 41848d8814d5e62af688f064c12aef317cb7ebf6 | |
| parent | 01a86435499d66b267765f89b7dd9c83c158ddfe (diff) | |
| parent | f939e092891dab1258655ad91f694db21247c5b1 (diff) | |
Disable proguard optimization when not using jack
am: f939e09289
Change-Id: I48cf49d2a78eb4b0e073a4f088a4f772b5cc8cb7
| -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 |