Merge "apex_sepolicy_tests only if default payload type is ext4" into main (fceb0a33) · Commits · e / os / android_build

core/Makefile

+3 −0

Original line number	Diff line number	Diff line
		@@ -5176,6 +5176,8 @@ INTERNAL_ALLIMAGES_FILES := \
		# Run apex_sepolicy_tests for all installed APEXes

		ifeq (,$(TARGET_BUILD_UNBUNDLED))
		# TODO(b/353896817) apex_sepolicy_tests supports only ext4
		ifeq (ext4,$(PRODUCT_DEFAULT_APEX_PAYLOAD_TYPE))
		intermediate := $(call intermediates-dir-for,PACKAGING,apex_sepolicy_tests)
		apex_dirs := \
		$(TARGET_OUT)/apex/% \
		@@ -5215,6 +5217,7 @@ droid_targets: run_apex_sepolicy_tests

		apex_files :=
		intermediate :=
		endif # PRODUCT_DEFAULT_APEX_PAYLOAD_TYPE
		endif # TARGET_BUILD_UNBUNDLED

		# -----------------------------------------------------------------