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

Commit 025a43fb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Preserve all COMPATIBILITY_SUITES values in module-info" am: 32085e7b am: 06665ff8 

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

Change-Id: If65c233c480aef1bfbc6482ed0fa3ffcb84fabee
parents cfebdda7 06665ff8

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)