StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Export list of "installable" files to soong_ui"

Browse Source
This commit is contained in:
Treehugger Robot
2020-01-04 05:16:24 +00:00
committed by Gerrit Code Review
parent f29df793c9 dec6e8e056
commit 99202ec0a6
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/definitions.mk
View File

@@ -108,6 +108,9 @@ ALL_VINTF_MANIFEST_FRAGMENTS_LIST:=
# All tests that should be skipped in presubmit check. # All tests that should be skipped in presubmit check.
ALL_DISABLED_PRESUBMIT_TESTS := ALL_DISABLED_PRESUBMIT_TESTS :=
# All compatibility suites mentioned in LOCAL_COMPATIBILITY_SUITES
ALL_COMPATIBILITY_SUITES :=
########################################################### ###########################################################
## Debugging; prints a variable list to stdout ## Debugging; prints a variable list to stdout
########################################################### ###########################################################
@@ -2894,6 +2897,7 @@ endef
# and use my_compat_dist_$(suite) to define the others. # and use my_compat_dist_$(suite) to define the others.
define create-suite-dependencies define create-suite-dependencies
$(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \ $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \
$(if $(filter $(suite),$(ALL_COMPATIBILITY_SUITES)),,$(eval ALL_COMPATIBILITY_SUITES += $(suite))) \
$(eval COMPATIBILITY.$(suite).FILES := \ $(eval COMPATIBILITY.$(suite).FILES := \
$$(COMPATIBILITY.$(suite).FILES) $$(foreach f,$$(my_compat_dist_$(suite)),$$(call word-colon,2,$$(f))) \ $$(COMPATIBILITY.$(suite).FILES) $$(foreach f,$$(my_compat_dist_$(suite)),$$(call word-colon,2,$$(f))) \
$$(foreach f,$$(my_compat_dist_config_$(suite)),$$(call word-colon,2,$$(f)))) \ $$(foreach f,$$(my_compat_dist_config_$(suite)),$$(call word-colon,2,$$(f)))) \

22
core/main.mk
View File

@@ -1256,6 +1256,28 @@ modules_to_install := $(sort \
$(CUSTOM_MODULES) \ $(CUSTOM_MODULES) \
) )
#
# 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 :=
# Don't include any GNU General Public License shared objects or static # Don't include any GNU General Public License shared objects or static
# libraries in SDK images. GPL executables (not static/dynamic libraries) # libraries in SDK images. GPL executables (not static/dynamic libraries)
# are okay if they don't link against any closed source libraries (directly # are okay if they don't link against any closed source libraries (directly