tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Move old installed file cleanup logic below build/make/core/Makefile" am: 4cd2568acc am: b8dad832a7

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2544890

Change-Id: I61bc49e29f62e3b39dbb60f67bf6a882176b6274
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Colin Cross 2023-04-19 04:23:50 +00:00 committed by Automerger Merge Worker
commit d844885259
1 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
core/main.mk
View file

@ -1386,29 +1386,6 @@ modules_to_install := $(sort \
$(CUSTOM_MODULES) \
)
ifdef FULL_BUILD
#
# Used by the cleanup logic in soong_ui to remove files that should no longer
# be installed.
#
# Include all tests, so that we remove them from the test suites / testcase
# folders when they are removed.
test_files := $(foreach ts,$(ALL_COMPATIBILITY_SUITES),$(COMPATIBILITY.$(ts).FILES))
$(shell mkdir -p $(PRODUCT_OUT) $(HOST_OUT))
$(file >$(PRODUCT_OUT)/.installable_files$(if $(filter address,$(SANITIZE_TARGET)),_asan), \
$(sort $(patsubst $(PRODUCT_OUT)/%,%,$(filter $(PRODUCT_OUT)/%, \
$(modules_to_install) $(test_files)))))
$(file >$(HOST_OUT)/.installable_test_files,$(sort \
$(patsubst $(HOST_OUT)/%,%,$(filter $(HOST_OUT)/%, \
$(test_files)))))
test_files :=
endif
# Dedpulicate compatibility suite dist files across modules and packages before
# copying them to their requested locations. Assign the eval result to an unused
# var to prevent Make from trying to make a sense of it.
@ -1467,6 +1444,28 @@ endif
modules_to_install := $(sort $(ALL_DEFAULT_INSTALLED_MODULES))
ALL_DEFAULT_INSTALLED_MODULES :=
ifdef FULL_BUILD
#
# Used by the cleanup logic in soong_ui to remove files that should no longer
# be installed.
#
# Include all tests, so that we remove them from the test suites / testcase
# folders when they are removed.
test_files := $(foreach ts,$(ALL_COMPATIBILITY_SUITES),$(COMPATIBILITY.$(ts).FILES))
$(shell mkdir -p $(PRODUCT_OUT) $(HOST_OUT))
$(file >$(PRODUCT_OUT)/.installable_files$(if $(filter address,$(SANITIZE_TARGET)),_asan), \
$(sort $(patsubst $(PRODUCT_OUT)/%,%,$(filter $(PRODUCT_OUT)/%, \
$(modules_to_install) $(test_files)))))
$(file >$(HOST_OUT)/.installable_test_files,$(sort \
$(patsubst $(HOST_OUT)/%,%,$(filter $(HOST_OUT)/%, \
$(test_files)))))
test_files :=
endif
# Some notice deps refer to module names without prefix or arch suffix where
# only the variants with them get built.