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

Commit 28874dc0 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Add Soong tools to PATH" 

am: b09e644e

* commit 'b09e644e':
  Add Soong tools to PATH

Change-Id: I7ba514ee46489e44ff64b5e1be8459567102a33c
parents 99e2c216 b09e644e

core/dumpvar.mk

+7 −2
Original line number Diff line number Diff line
@@ -35,10 +35,15 @@ endif 
# what to add to the path given the config we have chosen.

ifeq ($(CALLED_FROM_SETUP),true)



ifneq ($(filter /%,$(SOONG_HOST_OUT_EXECUTABLES)),)

ABP := $(SOONG_HOST_OUT_EXECUTABLES)

else

ABP := $(PWD)/$(SOONG_HOST_OUT_EXECUTABLES)

endif

ifneq ($(filter /%,$(HOST_OUT_EXECUTABLES)),)

ABP:=$(HOST_OUT_EXECUTABLES)

ABP := $(ABP):$(HOST_OUT_EXECUTABLES)

else

ABP:=$(PWD)/$(HOST_OUT_EXECUTABLES)

ABP := $(ABP):$(PWD)/$(HOST_OUT_EXECUTABLES)

endif



ANDROID_BUILD_PATHS := $(ABP)

core/envsetup.mk

+4 −0
Original line number Diff line number Diff line
@@ -204,6 +204,8 @@ OUT_DIR := $(OUT_DIR_COMMON_BASE)/$(notdir $(PWD)) 
endif

endif



SOONG_OUT_DIR := $(OUT_DIR)/soong



DEBUG_OUT_DIR := $(OUT_DIR)/debug



# Move the host or target under the debug/ directory
@@ -220,6 +222,7 @@ HOST_OUT_ROOT := $(HOST_OUT_ROOT_$(HOST_BUILD_TYPE)) 
HOST_OUT_release := $(HOST_OUT_ROOT_release)/$(HOST_OS)-$(HOST_PREBUILT_ARCH)

HOST_OUT_debug := $(HOST_OUT_ROOT_debug)/$(HOST_OS)-$(HOST_PREBUILT_ARCH)

HOST_OUT := $(HOST_OUT_$(HOST_BUILD_TYPE))

SOONG_HOST_OUT := $(SOONG_OUT_DIR)/host/$(HOST_OS)-$(HOST_PREBUILT_ARCH)

# TODO: remove

BUILD_OUT := $(HOST_OUT)
@@ -237,6 +240,7 @@ PRODUCT_OUT := $(TARGET_PRODUCT_OUT_ROOT)/$(TARGET_DEVICE) 
OUT_DOCS := $(TARGET_COMMON_OUT_ROOT)/docs



BUILD_OUT_EXECUTABLES := $(BUILD_OUT)/bin

SOONG_HOST_OUT_EXECUTABLES := $(SOONG_HOST_OUT)/bin



HOST_OUT_EXECUTABLES := $(HOST_OUT)/bin

HOST_OUT_SHARED_LIBRARIES := $(HOST_OUT)/lib64

core/soong.mk

+0 −1
Original line number Diff line number Diff line 
SOONG_OUT_DIR := $(OUT_DIR)/soong

SOONG := $(SOONG_OUT_DIR)/soong

SOONG_BOOTSTRAP := $(SOONG_OUT_DIR)/.soong.bootstrap

SOONG_BUILD_NINJA := $(SOONG_OUT_DIR)/build.ninja