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

Commit fa4dece0 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Make SOONG_HOST_OUT an alias for HOST_OUT" am: 6013329b 

Original change: https://android-review.googlesource.com/c/platform/build/+/1897199

Change-Id: If74d1933ed080729c69de2fe2f76283102dab413
parents 42294079 6013329b

CleanSpec.mk

+4 −0
Original line number Diff line number Diff line
@@ -769,6 +769,10 @@ $(call add-clean-step, rm -rf $(SOONG_HOST_OUT)) 
# More of SOONG_HOST_OUT_EXECUTABLES has been moved to HOST_OUT_EXECUTABLES

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



# Last of SOONG_HOST_OUT_EXECUTABLES has been moved to HOST_OUT_EXECUTABLES

# Don't use SOONG_HOST_OUT, it is now an alias for HOST_OUT.

$(call add-clean-step, rm -rf $(OUT_DIR)/soong/host)



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

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

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

core/envsetup.mk

+3 −1
Original line number Diff line number Diff line
@@ -343,7 +343,9 @@ HOST_OUT_ROOT := $(OUT_DIR)/host 


# We want to avoid two host bin directories in multilib build.

HOST_OUT := $(HOST_OUT_ROOT)/$(HOST_OS)-$(HOST_PREBUILT_ARCH)

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



# Soong now installs to the same directory as Make.

SOONG_HOST_OUT := $(HOST_OUT)



HOST_CROSS_OUT := $(HOST_OUT_ROOT)/$(HOST_CROSS_OS)-$(HOST_CROSS_ARCH)