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

Commit 6dd962fd authored by yangbill's avatar yangbill Committed by Bill Yang
Browse files

Preserve all COMPATIBILITY_SUITES values in module-info 

Extend COMPATIBILITY_SUITES in module-info to avoid overwriting previous
values. In particular, this happens for the `host-unit-tests` suite
which is automatically added by Soong rules only to be clobbered by the
modules that have both device and host variants.

Bug: 209806322
Test: source build/envsetup.sh ; lunch aosp_cf_x86_64_phone ;
      m out/target/product/vsoc_x86_64/module-info.json
Change-Id: I56a2d4c9786ed3da1e788ba211ec1bcaa6559549
parent 0d8d378b

core/base_rules.mk

+3 −1
Original line number Diff line number Diff line
@@ -1055,7 +1055,9 @@ ALL_MODULES.$(my_register_name).FOR_2ND_ARCH := true 
endif

ALL_MODULES.$(my_register_name).FOR_HOST_CROSS := $(my_host_cross)

ALL_MODULES.$(my_register_name).MODULE_NAME := $(LOCAL_MODULE)

ALL_MODULES.$(my_register_name).COMPATIBILITY_SUITES := $(LOCAL_COMPATIBILITY_SUITE)

ALL_MODULES.$(my_register_name).COMPATIBILITY_SUITES := \

  $(ALL_MODULES.$(my_register_name).COMPATIBILITY_SUITES) \

  $(filter-out $(ALL_MODULES.$(my_register_name).COMPATIBILITY_SUITES),$(LOCAL_COMPATIBILITY_SUITE))

ALL_MODULES.$(my_register_name).TEST_CONFIG := $(test_config)

ALL_MODULES.$(my_register_name).EXTRA_TEST_CONFIGS := $(LOCAL_EXTRA_FULL_TEST_CONFIGS)

ALL_MODULES.$(my_register_name).TEST_MAINLINE_MODULES := $(LOCAL_TEST_MAINLINE_MODULES)