Merge "IA: enable SSE fpmath, Separate ARCH_VARIANT and ARCH makefile settings"
diff --git a/core/config.mk b/core/config.mk
index 61cd0c6..f9b7116 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -340,4 +340,12 @@
INTERNAL_PLATFORM_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/public_api.xml
+# This is the standard way to name a directory containing prebuilt target
+# objects. E.g., prebuilt/$(TARGET_PREBUILT_TAG)/libc.so
+ifeq ($(TARGET_SIMULATOR),true)
+ TARGET_PREBUILT_TAG := $(TARGET_OS)-$(TARGET_ARCH)
+else
+ TARGET_PREBUILT_TAG := android-$(TARGET_ARCH)
+endif
+
include $(BUILD_SYSTEM)/dumpvar.mk
diff --git a/core/envsetup.mk b/core/envsetup.mk
index 87ac2f6..f375c20 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -147,14 +147,6 @@
TARGET_BUILD_TYPE := release
endif
-# This is the standard way to name a directory containing prebuilt target
-# objects. E.g., prebuilt/$(TARGET_PREBUILT_TAG)/libc.so
-ifeq ($(TARGET_SIMULATOR),true)
- TARGET_PREBUILT_TAG := $(TARGET_OS)-$(TARGET_ARCH)
-else
- TARGET_PREBUILT_TAG := android-$(TARGET_ARCH)
-endif
-
# ---------------------------------------------------------------
# figure out the output directories
diff --git a/core/main.mk b/core/main.mk
index f9e1098..b1a54ef 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -274,7 +274,7 @@
endif
# build the full stagefright library
-ifneq ($(strip BUILD_WITH_FULL_STAGEFRIGHT),)
+ifneq ($(strip $(BUILD_WITH_FULL_STAGEFRIGHT)),)
BUILD_WITH_FULL_STAGEFRIGHT := true
endif