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

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

Merge "Add unit_test option to module-info.json" am: 7c637077 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If2ea3f051c13ae5decd59cd7c6e1a991495c7ec3
parents 9de9e07e 7c637077

core/base_rules.mk

+1 −0
Original line number Diff line number Diff line
@@ -996,6 +996,7 @@ ALL_MODULES.$(my_register_name).TEST_MAINLINE_MODULES := $(LOCAL_TEST_MAINLINE_M 
ifndef LOCAL_IS_HOST_MODULE

ALL_MODULES.$(my_register_name).FILE_CONTEXTS := $(LOCAL_FILE_CONTEXTS)

endif

ALL_MODULES.$(my_register_name).IS_UNIT_TEST := $(LOCAL_IS_UNIT_TEST)

test_config :=



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

core/tasks/module-info.mk

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ $(MODULE_INFO_JSON): 
			'"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)", )], ' \

			'"is_unit_test": "$(ALL_MODULES.$(m).IS_UNIT_TEST)", ' \

			'},\n' \

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

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