| commit | 43708477b480d5b726d666abe1603ee6a78fdb02 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Wed Apr 22 04:31:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 22 04:31:19 2015 +0000 |
| tree | 32e1f9e94b4df019bcff8836df083b5761e9ac75 | |
| parent | cebbeced660ffb5a128bf246ef8bc92ee9719210 [diff] | |
| parent | 8c934ac65c7c361040d9c181fdb4bd258644fd53 [diff] |
am 8c934ac6: Remove workaround now unneeded with Proguard 5.1 * commit '8c934ac65c7c361040d9c181fdb4bd258644fd53': Remove workaround now unneeded with Proguard 5.1
diff --git a/Android.mk b/Android.mk index 0917793..c5482b4 100644 --- a/Android.mk +++ b/Android.mk
@@ -14,9 +14,6 @@ LOCAL_PROGUARD_FLAGS := $(proguard.flags) -# Workaround for "local variable type mismatch" error. -LOCAL_DX_FLAGS += --no-locals - include $(BUILD_PACKAGE) # Build the test package.