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

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

Move old installed file cleanup logic below build/make/core/Makefile 

build/make/core/Makefile modifies ALL_DEFAULT_INSTALLED_MODULES,
move the cleanup logic below where it is included so that any
additions are covered by the cleanup logic.

Bug: 267014648
Test: manual
Change-Id: If3ab59aa19273fb20f171a3bb74ea1a2c3841585
parent 2ba40b5b

core/main.mk

+22 −23
Original line number Diff line number Diff line
@@ -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.