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

Commit bca6483b authored by Colin Cross's avatar Colin Cross
Browse files

Move tools compiled by Soong to HOST_OUT_EXECUTABLES 

Soong now installs native tools to HOST_OUT_EXECUTABLES instead
of SOONG_HOST_OUT_EXECUTABLES.

Also add a cleanspec for SOONG_HOST_OUT to remove old files from
SOONG_HOST_OUT_EXECUTABLES.

Bug: 204136549
Test: m checkbuild
Change-Id: Id18213b9294b6d2cf78f657740c6d5a02733b8ad
parent 3a79e5b4

CleanSpec.mk

+3 −0
Original line number Diff line number Diff line
@@ -760,6 +760,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor-ramdisk) 
# Common R directory has been removed.

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/R)



# Most of SOONG_HOST_OUT_EXECUTABLES has been moved to HOST_OUT_EXECUTABLES

$(call add-clean-step, rm -rf $(SOONG_HOST_OUT))



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

core/config.mk

+3 −3
Original line number Diff line number Diff line
@@ -539,14 +539,14 @@ prebuilt_sdk_tools_bin := 
ACP := $(prebuilt_build_tools_bin)/acp

CKATI := $(prebuilt_build_tools_bin)/ckati

DEPMOD := $(HOST_OUT_EXECUTABLES)/depmod

FILESLIST := $(SOONG_HOST_OUT_EXECUTABLES)/fileslist

FILESLIST := $(HOST_OUT_EXECUTABLES)/fileslist

FILESLIST_UTIL :=$= build/make/tools/fileslist_util.py

HOST_INIT_VERIFIER := $(HOST_OUT_EXECUTABLES)/host_init_verifier

XMLLINT := $(SOONG_HOST_OUT_EXECUTABLES)/xmllint

XMLLINT := $(HOST_OUT_EXECUTABLES)/xmllint



# SOONG_ZIP is exported by Soong, but needs to be defined early for

# $OUT/dexpreopt.global.  It will be verified against the Soong version.

SOONG_ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/soong_zip

SOONG_ZIP := $(HOST_OUT_EXECUTABLES)/soong_zip



# ---------------------------------------------------------------

# Generic tools.