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

Commit d99c855d authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge "apex_sepolicy_tests only if default payload type is ext4" into main am: fceb0a33 

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



Change-Id: I24a0b2d3482bb7719482337dab01ba83d7195911
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2188cef0 fceb0a33

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



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