Merge remote-tracking branch 'aosp/master'

olibc · May 20, 2014 · 4f4ff57 · 4f4ff57
2 parents 5b27fcb + b082b5f
commit 4f4ff57
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/core/config.mk b/core/config.mk
@@ -473,7 +473,7 @@ ifdef TARGET_2ND_ARCH
   endif
 endif
 
-ifneq (,$(filter $(DEX2OAT_TARGET_CPU_VARIANT),cortex-a7 cortex-a15 krait))
+ifneq (,$(filter $(DEX2OAT_TARGET_CPU_VARIANT),cortex-a7 cortex-a15 krait denver))
   DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := div
 endif
 

diff --git a/target/product/core_64_bit.mk b/target/product/core_64_bit.mk
@@ -37,3 +37,6 @@ TARGET_PREFER_32_BIT_APPS := true
 
 TARGET_SUPPORTS_32_BIT_APPS := true
 TARGET_SUPPORTS_64_BIT_APPS := true
+
+# Disable DEXPREOPT until we have multilib support (bug 14694978).
+WITH_DEXPREOPT := false
-Original file line number
+Diff line change
@@ Expand Up / @@ -473,7 +473,7 @@ ifdef TARGET_2ND_ARCH @@
       endif
     endif
-    ifneq (,$(filter $(DEX2OAT_TARGET_CPU_VARIANT),cortex-a7 cortex-a15 krait))
+    ifneq (,$(filter $(DEX2OAT_TARGET_CPU_VARIANT),cortex-a7 cortex-a15 krait denver))
       DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := div
     endif
@@ Expand Down @@