Commit 5ff39f59 authored Sep 27, 2012 by Chirayu Desai Committed by Sam Mortimer Nov 09, 2017

envsetup: set OUT_DIR to an absolute path always

OUT_DIR was set to $(TOPDIR)out previously,
but $(TOPDIR) was null, so it was a relative path.
This broke releasetools, inline kernel building, etc
since they require absolute paths.
Fix it so that it is set to $(shell readlink -f .)/out
if $(TOPDIR) is null.

Also remove hacks which checked if (OUT_DIR) was out
and changed it to $(ANDROID_BUILD_TOP)/out to workaround
the aforementioned problem.

Change-Id: I459a3b1325a1bbea0565cd73f6acf160d4ed9b39

build: work around missing readlink -f on Mac

Change-Id: I5d56366cf33a2b02f1886c87815d00cff279779d

envsetup: use $(CURDIR) for getting current directory

Change-Id: I5f00faf64ec31d86dd2e48ec038748ce8499380b

parent 8beac45f

core/envsetup.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -284,8 +284,12 @@ endif

		ifeq (,$(strip $(OUT_DIR)))
		ifeq (,$(strip $(OUT_DIR_COMMON_BASE)))
		ifneq ($(TOPDIR),)
		OUT_DIR := $(TOPDIR)out
		else
		OUT_DIR := $(CURDIR)/out
		endif
		else
		OUT_DIR := $(OUT_DIR_COMMON_BASE)/$(notdir $(PWD))
		endif
		endif