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

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

Merge "Add test_mainline_modules option support in mk" am: 897cfaee 

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

Change-Id: I1688ae7c3bb013eed0a3b5fa148811e0d7c50e04
parents ab45f8b9 897cfaee

core/base_rules.mk

+1 −0
Original line number Diff line number Diff line
@@ -986,6 +986,7 @@ 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)

ALL_MODULES.$(my_register_name).TEST_MAINLINE_MODULES := $(LOCAL_TEST_MAINLINE_MODULES)

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
@@ -300,6 +300,7 @@ LOCAL_SYSTEM_SHARED_LIBRARIES:=none 
LOCAL_TARGET_REQUIRED_MODULES:=

LOCAL_TEST_CONFIG:=

LOCAL_TEST_DATA:=

LOCAL_TEST_MAINLINE_MODULES:=

LOCAL_TEST_MODULE_TO_PROGUARD_WITH:=

LOCAL_TIDY:=

LOCAL_TIDY_CHECKS:=

core/tasks/module-info.mk

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ $(MODULE_INFO_JSON): 
			'"srcs": [$(foreach w,$(sort $(ALL_MODULES.$(m).SRCS)),"$(w)", )], ' \

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

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

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

			'},\n' \

	 ) | sed -e 's/, *\]/]/g' -e 's/, *\}/ }/g' -e '$$s/,$$//' >> $@

	$(hide) echo '}' >> $@