am 023209b6: am 5ee3f096: Merge "Default TARGET_CPU_SMP to true."

* commit '023209b63ee4be4289b3e07b3c3dc54773523094':
  Default TARGET_CPU_SMP to true.
This commit is contained in:
Ying Wang 2014-05-17 00:12:50 +00:00 committed by Android Git Automerger
commit 5989a05130
1 changed files with 2 additions and 0 deletions

View File

@ -527,6 +527,8 @@ ifeq ($(TARGET_DEFAULT_JAVA_LIBRARIES),)
TARGET_DEFAULT_JAVA_LIBRARIES := core core-junit ext framework framework2 TARGET_DEFAULT_JAVA_LIBRARIES := core core-junit ext framework framework2
endif endif
TARGET_CPU_SMP ?= true
# Flags for DEX2OAT # Flags for DEX2OAT
DEX2OAT_TARGET_ARCH := $(TARGET_ARCH) DEX2OAT_TARGET_ARCH := $(TARGET_ARCH)
DEX2OAT_TARGET_CPU_VARIANT := $(TARGET_CPU_VARIANT) DEX2OAT_TARGET_CPU_VARIANT := $(TARGET_CPU_VARIANT)