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

Commit 4dbb80da authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Handle out being a symlink" 

am: 0314519b

* commit '0314519b':
  Handle out being a symlink
parents 9a73bcfe 0314519b

core/soong.mk

+15 −6
Original line number Original line Diff line number Diff line 
SOONG_OUT_DIR := $(OUT_DIR)/soong

SOONG_OUT_DIR := $(OUT_DIR)/soong

SOONG := $(SOONG_OUT_DIR)/soong



SOONG_BUILD_NINJA := $(SOONG_OUT_DIR)/build.ninja

# This needs to exist before the realpath checks below

SOONG_ANDROID_MK := $(SOONG_OUT_DIR)/Android.mk

$(shell mkdir -p $(SOONG_OUT_DIR))

SOONG_VARIABLES := $(SOONG_OUT_DIR)/soong.variables

SOONG_IN_MAKE := $(SOONG_OUT_DIR)/.soong.in_make





ifeq (,$(filter /%,$(SOONG_OUT_DIR)))

ifeq (,$(filter /%,$(SOONG_OUT_DIR)))

SOONG_TOP_RELPATH := $(shell python -c "import os; print os.path.relpath('$(TOP)', '$(SOONG_OUT_DIR)')")

SOONG_TOP_RELPATH := $(shell python -c "import os; print os.path.relpath('$(TOP)', '$(SOONG_OUT_DIR)')")

# Protect against out being a symlink and relative paths not working

ifneq ($(realpath $(SOONG_OUT_DIR)/$(SOONG_TOP_RELPATH)),$(realpath $(TOP)))

SOONG_OUT_DIR := $(abspath $(SOONG_OUT_DIR))

SOONG_TOP_RELPATH := $(abspath $(TOP))

endif

else

else

SOONG_TOP_RELPATH := $(realpath $(TOP))

SOONG_TOP_RELPATH := $(abspath $(TOP))

endif

endif





SOONG := $(SOONG_OUT_DIR)/soong

SOONG_BUILD_NINJA := $(SOONG_OUT_DIR)/build.ninja

SOONG_ANDROID_MK := $(SOONG_OUT_DIR)/Android.mk

SOONG_VARIABLES := $(SOONG_OUT_DIR)/soong.variables

SOONG_IN_MAKE := $(SOONG_OUT_DIR)/.soong.in_make



# Bootstrap soong.  Run only the first time for clean builds

# Bootstrap soong.  Run only the first time for clean builds

$(SOONG):

$(SOONG):

	$(hide) mkdir -p $(dir $@)

	$(hide) mkdir -p $(dir $@)