p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Add Soong tools to PATH" 

am: b09e644e1d

* commit 'b09e644e1db3439d85ce6dd9e371ac6514a4343c':
  Add Soong tools to PATH

Change-Id: I7ba514ee46489e44ff64b5e1be8459567102a33c
This commit is contained in:
Dan Willemsen 2016-06-01 02:45:03 +00:00 committed by android-build-merger
parent 99e2c216b4 b09e644e1d
commit 28874dc0c1
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/dumpvar.mk
View File

@ -35,10 +35,15 @@ endif
# 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)),) ifneq ($(filter /%,$(SOONG_HOST_OUT_EXECUTABLES)),)
ABP:=$(HOST_OUT_EXECUTABLES) ABP := $(SOONG_HOST_OUT_EXECUTABLES)
else else
ABP:=$(PWD)/$(HOST_OUT_EXECUTABLES) ABP := $(PWD)/$(SOONG_HOST_OUT_EXECUTABLES)
endif
ifneq ($(filter /%,$(HOST_OUT_EXECUTABLES)),)
ABP := $(ABP):$(HOST_OUT_EXECUTABLES)
else
ABP := $(ABP):$(PWD)/$(HOST_OUT_EXECUTABLES)
endif endif
ANDROID_BUILD_PATHS := $(ABP) ANDROID_BUILD_PATHS := $(ABP)

4
core/envsetup.mk
View File

@ -204,6 +204,8 @@ OUT_DIR := $(OUT_DIR_COMMON_BASE)/$(notdir $(PWD))
endif endif
endif endif
SOONG_OUT_DIR := $(OUT_DIR)/soong
DEBUG_OUT_DIR := $(OUT_DIR)/debug DEBUG_OUT_DIR := $(OUT_DIR)/debug
# Move the host or target under the debug/ directory # 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_release := $(HOST_OUT_ROOT_release)/$(HOST_OS)-$(HOST_PREBUILT_ARCH)
HOST_OUT_debug := $(HOST_OUT_ROOT_debug)/$(HOST_OS)-$(HOST_PREBUILT_ARCH) HOST_OUT_debug := $(HOST_OUT_ROOT_debug)/$(HOST_OS)-$(HOST_PREBUILT_ARCH)
HOST_OUT := $(HOST_OUT_$(HOST_BUILD_TYPE)) HOST_OUT := $(HOST_OUT_$(HOST_BUILD_TYPE))
SOONG_HOST_OUT := $(SOONG_OUT_DIR)/host/$(HOST_OS)-$(HOST_PREBUILT_ARCH)
# TODO: remove # TODO: remove
BUILD_OUT := $(HOST_OUT) BUILD_OUT := $(HOST_OUT)
@ -237,6 +240,7 @@ PRODUCT_OUT := $(TARGET_PRODUCT_OUT_ROOT)/$(TARGET_DEVICE)
OUT_DOCS := $(TARGET_COMMON_OUT_ROOT)/docs OUT_DOCS := $(TARGET_COMMON_OUT_ROOT)/docs
BUILD_OUT_EXECUTABLES := $(BUILD_OUT)/bin BUILD_OUT_EXECUTABLES := $(BUILD_OUT)/bin
SOONG_HOST_OUT_EXECUTABLES := $(SOONG_HOST_OUT)/bin
HOST_OUT_EXECUTABLES := $(HOST_OUT)/bin HOST_OUT_EXECUTABLES := $(HOST_OUT)/bin
HOST_OUT_SHARED_LIBRARIES := $(HOST_OUT)/lib64 HOST_OUT_SHARED_LIBRARIES := $(HOST_OUT)/lib64

1
core/soong.mk
View File

@ -1,4 +1,3 @@
SOONG_OUT_DIR := $(OUT_DIR)/soong
SOONG := $(SOONG_OUT_DIR)/soong SOONG := $(SOONG_OUT_DIR)/soong
SOONG_BOOTSTRAP := $(SOONG_OUT_DIR)/.soong.bootstrap SOONG_BOOTSTRAP := $(SOONG_OUT_DIR)/.soong.bootstrap
SOONG_BUILD_NINJA := $(SOONG_OUT_DIR)/build.ninja SOONG_BUILD_NINJA := $(SOONG_OUT_DIR)/build.ninja