commit 03d02a2687cbd59b8871ccbe0eeb3c2c51df063c
author Ying Wang <wangying@google.com> Tue May 13 16:54:29 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue May 13 16:54:29 2014 +0000
tree 1b4e1939781dd363643251cf1e1fe57b0ec96fb4
parent 72344a7329ab984de716b630cb88039d9ed820a0
parent b082b5f1b2d1a45ee91de186428d5e341d02c08a

am b082b5f1: Merge "Disable DEXPREOPT until we have multilib support"

* commit 'b082b5f1b2d1a45ee91de186428d5e341d02c08a':
  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 5d7abcb..a21620c 100644
--- a/target/product/core_64_bit.mk
+++ b/target/product/core_64_bit.mk
@@ -37,3 +37,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