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

* commit 'bf6d9ec1fa2e1313c2ca8558c5f0710cbea201c1': You CANNOT change the global WITH_DEXPREOPT

am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
* commit 'bf6d9ec1fa2e1313c2ca8558c5f0710cbea201c1': You CANNOT change the global WITH_DEXPREOPT
e251c9eb · Ying Wang · Android Git Automerger · 42470ba6 · efd4ae40 · e251c9eb
Commit e251c9eb 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)