tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures"

Browse source
This commit is contained in:
Jean-Baptiste Queru 2010-11-19 11:01:22 -08:00 committed by Android Code Review
commit 493306f7c3
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/config.mk
View file

@ -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

8
core/envsetup.mk
View file

@ -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