diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-11-19 11:01:22 -0800 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-11-19 11:01:22 -0800 |
| commit | 493306f7c318d632186bebd732708d4299e66a62 (patch) | |
| tree | a9ebf2012fac626f4ab27fed099ea554bd17979d | |
| parent | 4130c80aa3c7ec6e192f99e9cce4918b4b3c804d (diff) | |
| parent | f1582e549926e75a4edb194c4ff724df633299d4 (diff) | |
| download | build-493306f7c318d632186bebd732708d4299e66a62.tar.gz | |
Merge "Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures"
| -rw-r--r-- | core/config.mk | 8 | ||||
| -rw-r--r-- | 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 |