diff options
author | Ying Wang <wangying@google.com> | 2014-05-02 03:57:04 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-02 03:57:04 +0000 |
commit | 49512cb01065b41c0113248c2c02800de1156d50 (patch) | |
tree | 6931963b83b155148dd0bacd7d806665a62b36d8 | |
parent | d20f0a4260763531acf5de677e4830afe0bfc53e (diff) | |
parent | eaa37c503adff80aa6a99d1503bd0d0343a93a23 (diff) | |
download | protobuf-idea133-weekly-release.tar.gz |
Merge "You CANNOT change the global WITH_DEXPREOPT"idea133-weekly-release
-rw-r--r-- | Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index faf6e393d..3f9b2e14d 100644 --- a/Android.mk +++ b/Android.mk @@ -437,6 +437,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := libprotobuf-java-2.3.0-nano \ android-nano-test-parcelable \ android-nano-test-parcelable-extendable -WITH_DEXPREOPT := false +LOCAL_DEX_PREOPT := false include $(BUILD_PACKAGE) |