Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 316febd7 authored Dec 06, 2011 by Jean-Baptiste Queru Committed by Android Git Automerger Dec 06, 2011

am 78b68045: am ffe03c98: Set OUT_DIR based on a common base path

* commit '78b68045':
  Set OUT_DIR based on a common base path

parents 7948c255 78b68045

core/dumpvar.mk

+5 −0

Original line number	Diff line number	Diff line
		@@ -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 ARM toolchain bin dir if it actually exists
		ifneq ($(wildcard $(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/bin),)
		@@ -78,5 +82,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

core/envsetup.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -141,7 +141,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