Merge "Preserve all COMPATIBILITY_SUITES values in module-info" am: 32085e7bd7 am: 06665ff87f

Original change: https://android-review.googlesource.com/c/platform/build/+/1913437

Change-Id: If65c233c480aef1bfbc6482ed0fa3ffcb84fabee
This commit is contained in:
Treehugger Robot
2021-12-16 22:50:55 +00:00
committed by Automerger Merge Worker

View File

@@ -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)