Merge "Preserve all COMPATIBILITY_SUITES values in module-info" (32085e7b) · Commits · e / os / android_build

core/base_rules.mk

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1055,7 +1055,9 @@ ALL_MODULES.$(my_register_name).FOR_2ND_ARCH := true
	endif		endif
	ALL_MODULES.$(my_register_name).FOR_HOST_CROSS := $(my_host_cross)		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).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).TEST_CONFIG := $(test_config)
	ALL_MODULES.$(my_register_name).EXTRA_TEST_CONFIGS := $(LOCAL_EXTRA_FULL_TEST_CONFIGS)		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)		ALL_MODULES.$(my_register_name).TEST_MAINLINE_MODULES := $(LOCAL_TEST_MAINLINE_MODULES)