StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Export test config info to module-info while the module is uninstallable"

Browse Source
This commit is contained in:
Yike Zhang
2023-02-14 23:30:39 +00:00
committed by Gerrit Code Review
parent aa055f064e 40f5c3a1fe
commit 249865de52
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
core/base_rules.mk
View File

@@ -716,6 +716,15 @@ endif
## Compatibility suite files. ## Compatibility suite files.
########################################################### ###########################################################
ifdef LOCAL_COMPATIBILITY_SUITE ifdef LOCAL_COMPATIBILITY_SUITE
ifneq (,$(LOCAL_FULL_TEST_CONFIG))
test_config := $(LOCAL_FULL_TEST_CONFIG)
else ifneq (,$(LOCAL_TEST_CONFIG))
test_config := $(LOCAL_PATH)/$(LOCAL_TEST_CONFIG)
else
test_config := $(wildcard $(LOCAL_PATH)/AndroidTest.xml)
endif
ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE)) ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE))
# If we are building a native test or benchmark and its stem variants are not defined, # If we are building a native test or benchmark and its stem variants are not defined,
@@ -762,13 +771,6 @@ $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \
# Auto-generate build config. # Auto-generate build config.
ifneq (,$(LOCAL_FULL_TEST_CONFIG))
test_config := $(LOCAL_FULL_TEST_CONFIG)
else ifneq (,$(LOCAL_TEST_CONFIG))
test_config := $(LOCAL_PATH)/$(LOCAL_TEST_CONFIG)
else
test_config := $(wildcard $(LOCAL_PATH)/AndroidTest.xml)
endif
ifeq (,$(test_config)) ifeq (,$(test_config))
ifneq (true,$(is_native)) ifneq (true,$(is_native))
is_instrumentation_test := true is_instrumentation_test := true
@@ -847,16 +849,6 @@ else
endif endif
endif # $(my_prefix)$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_compat_files endif # $(my_prefix)$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_compat_files
# HACK: pretend a soong LOCAL_FULL_TEST_CONFIG is autogenerated by setting the flag in
# module-info.json
# TODO: (b/113029686) Add explicit flag from Soong to determine if a test was
# autogenerated.
ifneq (,$(filter $(SOONG_OUT_DIR)%,$(LOCAL_FULL_TEST_CONFIG)))
ifeq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))
ALL_MODULES.$(my_register_name).auto_test_config := true
endif
endif
ifeq ($(use_testcase_folder),true) ifeq ($(use_testcase_folder),true)
ifneq ($(my_test_data_file_pairs),) ifneq ($(my_test_data_file_pairs),)
@@ -897,6 +889,17 @@ $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \
$(eval my_compat_dist_test_data_$(suite) := )) $(eval my_compat_dist_test_data_$(suite) := ))
endif # LOCAL_UNINSTALLABLE_MODULE endif # LOCAL_UNINSTALLABLE_MODULE
# HACK: pretend a soong LOCAL_FULL_TEST_CONFIG is autogenerated by setting the flag in
# module-info.json
# TODO: (b/113029686) Add explicit flag from Soong to determine if a test was
# autogenerated.
ifneq (,$(filter $(SOONG_OUT_DIR)%,$(LOCAL_FULL_TEST_CONFIG)))
ifeq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))
ALL_MODULES.$(my_register_name).auto_test_config := true
endif
endif
endif # LOCAL_COMPATIBILITY_SUITE endif # LOCAL_COMPATIBILITY_SUITE
my_supported_variant := my_supported_variant :=