aboutsummaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2014-05-02 04:00:31 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-02 04:00:31 +0000
commit94f522f907e3f34f70d9e7816b947e62fddbb267 (patch)
tree6931963b83b155148dd0bacd7d806665a62b36d8 /Android.mk
parent58eb8e98d17971273548930a7e8d45e69995a2c8 (diff)
parent49512cb01065b41c0113248c2c02800de1156d50 (diff)
downloadexternal_protobuf-94f522f907e3f34f70d9e7816b947e62fddbb267.zip
external_protobuf-94f522f907e3f34f70d9e7816b947e62fddbb267.tar.gz
external_protobuf-94f522f907e3f34f70d9e7816b947e62fddbb267.tar.bz2
am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
* commit '49512cb01065b41c0113248c2c02800de1156d50': You CANNOT change the global WITH_DEXPREOPT
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index faf6e39..3f9b2e1 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)