commit 32085e7bd7c33f5a63267bf31ebf0593d4cd02b6
author Treehugger Robot <treehugger-gerrit@google.com> Thu Dec 16 01:29:59 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 16 01:29:59 2021 +0000
tree 4d851782b9553ee81bb06396dc4fb213c8612078
parent 06c7e31f0191f52e8003f90c126c9d9568a0add9
parent 6dd962fdda8eea1ef33544c00452f7a7352e93e5

Merge "Preserve all COMPATIBILITY_SUITES values in module-info"

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index 134cb8f..8a5440f 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -1055,7 +1055,9 @@
 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)