diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2011-12-06 10:29:46 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2011-12-06 14:36:49 -0800 |
| commit | ffe03c984b2836a9b4e4ddb5a17ec0dd26ba686c (patch) | |
| tree | b9e595cf482a40727c38d9528ba0dfb472bca846 | |
| parent | 37db6cf627b19d47ae5eef86db04a34b0d9c6064 (diff) | |
| download | build-ffe03c984b2836a9b4e4ddb5a17ec0dd26ba686c.zip build-ffe03c984b2836a9b4e4ddb5a17ec0dd26ba686c.tar.gz build-ffe03c984b2836a9b4e4ddb5a17ec0dd26ba686c.tar.bz2 | |
Set OUT_DIR based on a common base path
Change-Id: I2c4ba8b101d4d186ed4b371b9d07b3bcf75bbcc9
Author: Jean-Baptiste Queru<jbq@google.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
| -rw-r--r-- | core/dumpvar.mk | 5 | ||||
| -rw-r--r-- | core/envsetup.mk | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/core/dumpvar.mk b/core/dumpvar.mk index e0de464..ee3bbfc 100644 --- a/core/dumpvar.mk +++ b/core/dumpvar.mk @@ -3,7 +3,11 @@ # what to add to the path given the config we have chosen. ifeq ($(CALLED_FROM_SETUP),true) +ifneq ($(filter /%,$(HOST_OUT_EXECUTABLES)),) +ABP:=$(HOST_OUT_EXECUTABLES) +else ABP:=$(PWD)/$(HOST_OUT_EXECUTABLES) +endif # Add the toolchain bin dir if it actually exists ifneq ($(wildcard $(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/bin),) @@ -72,5 +76,6 @@ $(info HOST_ARCH=$(HOST_ARCH)) $(info HOST_OS=$(HOST_OS)) $(info HOST_BUILD_TYPE=$(HOST_BUILD_TYPE)) $(info BUILD_ID=$(BUILD_ID)) +$(info OUT_DIR=$(OUT_DIR)) $(info ============================================) endif diff --git a/core/envsetup.mk b/core/envsetup.mk index c3ae3b0..e8c924e 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -133,7 +133,11 @@ endif # figure out the output directories ifeq (,$(strip $(OUT_DIR))) +ifeq (,$(strip $(OUT_DIR_COMMON_BASE))) OUT_DIR := $(TOPDIR)out +else +OUT_DIR := $(OUT_DIR_COMMON_BASE)/$(notdir $(PWD)) +endif endif DEBUG_OUT_DIR := $(OUT_DIR)/debug |