am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"

* commit '49512cb01065b41c0113248c2c02800de1156d50': You CANNOT change the global WITH_DEXPREOPT

am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
* commit '49512cb01065b41c0113248c2c02800de1156d50': You CANNOT change the global WITH_DEXPREOPT
70ef74aa · Ying Wang · Android Git Automerger · 3e46c9b5 · b54018a2 · 70ef74aa
Commit 70ef74aa authored May 02, 2014 by Ying Wang Committed by Android Git Automerger May 02, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Android.mk Android.mk +1 -1

No files found.
--- 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)