Merge "Add supported variants to module-info" (b2d71c9b) · Commits · e / os / android_build

core/base_rules.mk

+14 −0

Original line number	Diff line number	Diff line
		@@ -875,6 +875,16 @@ $(foreach suite, $(LOCAL_COMPATIBILITY_SUITE), \
		endif # LOCAL_UNINSTALLABLE_MODULE
		endif # LOCAL_COMPATIBILITY_SUITE

		my_supported_variant :=
		ifeq ($(my_host_cross),true)
		my_supported_variant := HOST_CROSS
		else
		ifdef LOCAL_IS_HOST_MODULE
		my_supported_variant := HOST
		else
		my_supported_variant := DEVICE
		endif
		endif
		###########################################################
		## Add test module to ALL_DISABLED_PRESUBMIT_TESTS if LOCAL_PRESUBMIT_DISABLED is set to true.
		###########################################################
		@@ -1001,6 +1011,10 @@ ifdef LOCAL_TEST_DATA_BINS
		$(ALL_MODULES.$(my_register_name).TEST_DATA_BINS) $(LOCAL_TEST_DATA_BINS)
		endif

		ALL_MODULES.$(my_register_name).SUPPORTED_VARIANTS := \
		$(ALL_MODULES.$(my_register_name).SUPPORTED_VARIANTS) \
		$(filter-out $(ALL_MODULES.$(my_register_name).SUPPORTED_VARIANTS),$(my_supported_variant))

		##########################################################################
		## When compiling against the VNDK, add the .vendor or .product suffix to
		## required modules.

+1 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ $(MODULE_INFO_JSON):
		'"data": [$(foreach w,$(sort $(ALL_MODULES.$(m).TEST_DATA)),"$(w)", )], ' \
		'"runtime_dependencies": [$(foreach w,$(sort $(ALL_MODULES.$(m).LOCAL_RUNTIME_LIBRARIES)),"$(w)", )], ' \
		'"data_dependencies": [$(foreach w,$(sort $(ALL_MODULES.$(m).TEST_DATA_BINS)),"$(w)", )], ' \
		'"supported_variants": [$(foreach w,$(sort $(ALL_MODULES.$(m).SUPPORTED_VARIANTS)),"$(w)", )], ' \
		'},\n' \
		) \| sed -e 's/, \]/]/g' -e 's/, \}/ }/g' -e '$$s/,$$//' >> $@
		$(hide) echo '}' >> $@