From bca6483b0779b07da84f48b74ba771045459d2f3 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 25 Oct 2021 18:44:00 -0700 Subject: [PATCH] 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 --- CleanSpec.mk | 3 +++ core/config.mk | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CleanSpec.mk b/CleanSpec.mk index 639c4ef0f3..fff49b33fb 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -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 # ************************************************ diff --git a/core/config.mk b/core/config.mk index 8f47ab58b7..e24e957930 100644 --- a/core/config.mk +++ b/core/config.mk @@ -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. -- GitLab