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

Commit 759d98d5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add extra_test_configs option support in mk" am: 67c930a3 am: e783a473 

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

Change-Id: I5bd82edf598a4665e9ab93bec7d9a1798a91a685
parents 3285c5ae e783a473

core/base_rules.mk

+8 −0
Original line number Diff line number Diff line
@@ -757,6 +757,13 @@ else 
        $(test_config):$(dir)/$(LOCAL_MODULE).config)))

  endif



  ifneq (,$(LOCAL_EXTRA_FULL_TEST_CONFIGS))

    $(foreach test_config_file, $(LOCAL_EXTRA_FULL_TEST_CONFIGS), \

      $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \

        $(eval my_compat_dist_config_$(suite) += $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \

          $(test_config_file):$(dir)/$(notdir $(test_config_file))))))

  endif



  ifneq (,$(wildcard $(LOCAL_PATH)/DynamicConfig.xml))

    $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \

      $(eval my_compat_dist_config_$(suite) += $(foreach dir, $(call compatibility_suite_dirs,$(suite)), \
@@ -973,6 +980,7 @@ 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).TEST_CONFIG := $(test_config)

ALL_MODULES.$(my_register_name).EXTRA_TEST_CONFIGS := $(LOCAL_EXTRA_FULL_TEST_CONFIGS)

test_config :=



INSTALLABLE_FILES.$(LOCAL_INSTALLED_MODULE).MODULE := $(my_register_name)

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ LOCAL_EXPORT_PROGUARD_FLAG_FILES:= 
LOCAL_EXPORT_SDK_LIBRARIES:=

LOCAL_EXPORT_SHARED_LIBRARY_HEADERS:=

LOCAL_EXPORT_STATIC_LIBRARY_HEADERS:=

LOCAL_EXTRA_FULL_TEST_CONFIGS:=

LOCAL_EXTRACT_APK:=

LOCAL_EXTRACT_DPI_APK:=

LOCAL_FDO_SUPPORT:=

core/tasks/module-info.mk

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ $(MODULE_INFO_JSON): 
			'"compatibility_suites": [$(foreach w,$(sort $(ALL_MODULES.$(m).COMPATIBILITY_SUITES)),"$(w)", )], ' \

			'"auto_test_config": [$(ALL_MODULES.$(m).auto_test_config)], ' \

			'"module_name": "$(ALL_MODULES.$(m).MODULE_NAME)", ' \

			'"test_config": [$(if $(ALL_MODULES.$(m).TEST_CONFIG),"$(ALL_MODULES.$(m).TEST_CONFIG)")], ' \

			'"test_config": [$(foreach w,$(strip $(ALL_MODULES.$(m).TEST_CONFIG) $(ALL_MODULES.$(m).EXTRA_TEST_CONFIGS)).TEST_CONFIG,"$(w)", )], ' \

			'"dependencies": [$(foreach w,$(sort $(ALL_DEPS.$(m).ALL_DEPS)),"$(w)", )], ' \

			'"srcs": [$(foreach w,$(sort $(ALL_MODULES.$(m).SRCS)),"$(w)", )], ' \

			'"srcjars": [$(foreach w,$(sort $(ALL_MODULES.$(m).SRCJARS)),"$(w)", )], ' \