commit 2ec7c7a21ca2fcce44588de7db8deb80ea72a1aa
author Ying Wang <wangying@google.com> Tue May 13 17:06:01 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue May 13 17:06:01 2014 +0000
tree 7b5ee37ff87f0680463e47680ae6100010069438
parent 03ff5c3a583144ab29848f94e59f48bada9bde87
parent 5c7c9887f4216dbd94cc40451b3e4cc3dfd5a441

am 5c7c9887: am 03d02a26: am b082b5f1: Merge "Disable DEXPREOPT until we have multilib support"

* commit '5c7c9887f4216dbd94cc40451b3e4cc3dfd5a441':
  Disable DEXPREOPT until we have multilib support

target/product/core_64_bit.mk

diff --git a/target/product/core_64_bit.mk b/target/product/core_64_bit.mk
index 971b6bd..e2fc1a6 100644
--- a/target/product/core_64_bit.mk
+++ b/target/product/core_64_bit.mk
@@ -31,3 +31,6 @@
 
 TARGET_SUPPORTS_32_BIT_APPS := true
 TARGET_SUPPORTS_64_BIT_APPS := true
+
+# Disable DEXPREOPT until we have multilib support (bug 14694978).
+WITH_DEXPREOPT := false