summaryrefslogtreecommitdiffstats
path: root/core/envsetup.mk
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-11-19 16:56:26 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-11-19 16:56:26 -0800
commit1607ba1c87da6c6c9452c5d30d5c6b6944a30dcb (patch)
tree27831f66faadaed827783a0fc4d917564a668bbb /core/envsetup.mk
parent2248e68003c61dae8fa8083e342c523d477922d6 (diff)
parent554eeb6c7426c8c1df551516cff903d69ae94f26 (diff)
downloadbuild-1607ba1c87da6c6c9452c5d30d5c6b6944a30dcb.zip
build-1607ba1c87da6c6c9452c5d30d5c6b6944a30dcb.tar.gz
build-1607ba1c87da6c6c9452c5d30d5c6b6944a30dcb.tar.bz2
am 554eeb6c: am 493306f7: Merge "Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures"
* commit '554eeb6c7426c8c1df551516cff903d69ae94f26': Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures
Diffstat (limited to 'core/envsetup.mk')
-rw-r--r--core/envsetup.mk8
1 files changed, 0 insertions, 8 deletions
diff --git a/core/envsetup.mk b/core/envsetup.mk
index c8c5634..800a9bf 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -158,14 +158,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