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

Commit 8e080cce authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

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

am: 99202ec0

Change-Id: I252f4748396572d4b6c0f26148dc51b0c01b2f9e
parents a9bfb4fa 99202ec0

core/definitions.mk

+4 −0
Original line number Diff line number Diff line
@@ -108,6 +108,9 @@ ALL_VINTF_MANIFEST_FRAGMENTS_LIST:= 
# All tests that should be skipped in presubmit check.

ALL_DISABLED_PRESUBMIT_TESTS :=



# All compatibility suites mentioned in LOCAL_COMPATIBILITY_SUITES

ALL_COMPATIBILITY_SUITES :=



###########################################################

## Debugging; prints a variable list to stdout

###########################################################
@@ -2894,6 +2897,7 @@ endef 
#    and use my_compat_dist_$(suite) to define the others.

define create-suite-dependencies

$(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \

  $(if $(filter $(suite),$(ALL_COMPATIBILITY_SUITES)),,$(eval ALL_COMPATIBILITY_SUITES += $(suite))) \

  $(eval COMPATIBILITY.$(suite).FILES := \

    $$(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)))) \

core/main.mk

+22 −0
Original line number Diff line number Diff line
@@ -1256,6 +1256,28 @@ modules_to_install := $(sort \ 
    $(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

# libraries in SDK images.  GPL executables (not static/dynamic libraries)

# are okay if they don't link against any closed source libraries (directly