summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-11-25 18:51:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-25 18:51:51 +0000
commitd5a7712d873cf1360303df5c3d2240abce4ed883 (patch)
treedd18e9ee4cccb414ed705065d881d32f9756f02a
parent54d46a7e6a96495779ad316f88523b6902c723cd (diff)
parent7adbb466597a52873605b14950e70f3d2bc0f4c8 (diff)
downloadbuild-d5a7712d873cf1360303df5c3d2240abce4ed883.zip
build-d5a7712d873cf1360303df5c3d2240abce4ed883.tar.gz
build-d5a7712d873cf1360303df5c3d2240abce4ed883.tar.bz2
am 7adbb466: Merge "Remove TARGET_CPU_SMP."
* commit '7adbb466597a52873605b14950e70f3d2bc0f4c8': Remove TARGET_CPU_SMP.
-rw-r--r--core/config.mk2
-rw-r--r--core/product.mk1
2 files changed, 0 insertions, 3 deletions
diff --git a/core/config.mk b/core/config.mk
index a651f29..aa82e93 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -535,8 +535,6 @@ ifeq ($(TARGET_DEFAULT_JAVA_LIBRARIES),)
TARGET_DEFAULT_JAVA_LIBRARIES := core-libart core-junit ext framework
endif
-TARGET_CPU_SMP ?= true
-
# Flags for DEX2OAT
DEX2OAT_TARGET_ARCH := $(TARGET_ARCH)
DEX2OAT_TARGET_CPU_VARIANT := $(TARGET_CPU_VARIANT)
diff --git a/core/product.mk b/core/product.mk
index ed906cb..a7a1fb2 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -242,7 +242,6 @@ _product_stash_var_list := $(_product_var_list) \
TARGET_PROVIDES_INIT_RC \
TARGET_CPU_ABI \
TARGET_CPU_ABI2 \
- TARGET_CPU_SMP \
_product_stash_var_list += \