StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set OUT_DIR based on a common base path

Browse Source 
Change-Id: I2c4ba8b101d4d186ed4b371b9d07b3bcf75bbcc9
Author: Jean-Baptiste Queru<jbq@google.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
This commit is contained in:
Jean-Baptiste Queru
2011-12-06 10:29:46 -08:00
parent 37db6cf627
commit ffe03c984b
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/dumpvar.mk
View File

@@ -3,7 +3,11 @@
# what to add to the path given the config we have chosen. # what to add to the path given the config we have chosen.
ifeq ($(CALLED_FROM_SETUP),true) ifeq ($(CALLED_FROM_SETUP),true)
ifneq ($(filter /%,$(HOST_OUT_EXECUTABLES)),)
ABP:=$(HOST_OUT_EXECUTABLES)
else
ABP:=$(PWD)/$(HOST_OUT_EXECUTABLES) ABP:=$(PWD)/$(HOST_OUT_EXECUTABLES)
endif
# Add the toolchain bin dir if it actually exists # Add the toolchain bin dir if it actually exists
ifneq ($(wildcard $(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/bin),) 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_OS=$(HOST_OS))
$(info HOST_BUILD_TYPE=$(HOST_BUILD_TYPE)) $(info HOST_BUILD_TYPE=$(HOST_BUILD_TYPE))
$(info BUILD_ID=$(BUILD_ID)) $(info BUILD_ID=$(BUILD_ID))
$(info OUT_DIR=$(OUT_DIR))
$(info ============================================) $(info ============================================)
endif endif

4
core/envsetup.mk
View File

@@ -133,7 +133,11 @@ endif
# figure out the output directories # figure out the output directories
ifeq (,$(strip $(OUT_DIR))) ifeq (,$(strip $(OUT_DIR)))
ifeq (,$(strip $(OUT_DIR_COMMON_BASE)))
OUT_DIR := $(TOPDIR)out OUT_DIR := $(TOPDIR)out
else
OUT_DIR := $(OUT_DIR_COMMON_BASE)/$(notdir $(PWD))
endif
endif endif
DEBUG_OUT_DIR := $(OUT_DIR)/debug DEBUG_OUT_DIR := $(OUT_DIR)/debug