Merge "Refactor sanitized library on-disk layout - Make." into oc-dev (07029188) · Commits · e / os / android_build

CleanSpec.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -410,6 +410,10 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/lib*)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/vendor/lib*)

		# Sanitized libraries now live in a different location.
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/lib*)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/vendor/lib*)

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -112,6 +112,7 @@ HOST_PREBUILT_TAG := $(BUILD_OS)-$(HOST_PREBUILT_ARCH)
		TARGET_COPY_OUT_SYSTEM := system
		TARGET_COPY_OUT_SYSTEM_OTHER := system_other
		TARGET_COPY_OUT_DATA := data
		TARGET_COPY_OUT_ASAN := $(TARGET_COPY_OUT_DATA)/asan
		TARGET_COPY_OUT_OEM := oem
		TARGET_COPY_OUT_ODM := odm
		TARGET_COPY_OUT_ROOT := root
		@@ -335,7 +336,7 @@ TARGET_OUT_COMMON_GEN := $(TARGET_COMMON_OUT_ROOT)/gen

		TARGET_OUT := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_SYSTEM)
		ifneq ($(filter address,$(SANITIZE_TARGET)),)
		target_out_shared_libraries_base := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_DATA)
		target_out_shared_libraries_base := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_ASAN)/system
		else
		target_out_shared_libraries_base := $(TARGET_OUT)
		endif
		@@ -415,7 +416,7 @@ TARGET_OUT_CACHE := $(PRODUCT_OUT)/cache

		TARGET_OUT_VENDOR := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)
		ifneq ($(filter address,$(SANITIZE_TARGET)),)
		target_out_vendor_shared_libraries_base := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_DATA)/vendor
		target_out_vendor_shared_libraries_base := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_ASAN)/vendor
		else
		target_out_vendor_shared_libraries_base := $(TARGET_OUT_VENDOR)
		endif