From f1582e549926e75a4edb194c4ff724df633299d4 Mon Sep 17 00:00:00 2001 From: Bruce Beare Date: Thu, 14 Oct 2010 14:31:48 -0700 Subject: [PATCH] Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures Change-Id: I5c1010d9caaa8d9ffaf65999fa3649c3c2be8caa Signed-off-by: Bruce Beare --- core/config.mk | 8 ++++++++ core/envsetup.mk | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/config.mk b/core/config.mk index 61cd0c68f4..f9b711660b 100644 --- a/core/config.mk +++ b/core/config.mk @@ -340,4 +340,12 @@ TARGET_AVAILABLE_SDK_VERSIONS := current $(call numerically_sort,\ 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 87ac2f68a8..f375c20891 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -147,14 +147,6 @@ ifneq ($(TARGET_BUILD_TYPE),debug) 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