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

Commit fef026e1 authored by Jooyung Han's avatar Jooyung Han Committed by Gerrit Code Review
Browse files

Merge "Run apex_sepolicy_tests with erofs apexes" into main

parents 5c87b686 7f50a123

core/Makefile

+3 −5
Original line number Original line Diff line number Diff line
@@ -5159,8 +5159,7 @@ INTERNAL_ALLIMAGES_FILES := \ 
# Run apex_sepolicy_tests for all installed APEXes

# Run apex_sepolicy_tests for all installed APEXes





ifeq (,$(TARGET_BUILD_UNBUNDLED))

ifeq (,$(TARGET_BUILD_UNBUNDLED))

# TODO(b/353896817) apex_sepolicy_tests supports only ext4

ifneq (,$(filter ext4 erofs,$(PRODUCT_DEFAULT_APEX_PAYLOAD_TYPE)))

ifeq (ext4,$(PRODUCT_DEFAULT_APEX_PAYLOAD_TYPE))

intermediate := $(call intermediates-dir-for,PACKAGING,apex_sepolicy_tests)

intermediate := $(call intermediates-dir-for,PACKAGING,apex_sepolicy_tests)

apex_dirs := \

apex_dirs := \

  $(TARGET_OUT)/apex/% \

  $(TARGET_OUT)/apex/% \
@@ -5177,11 +5176,10 @@ apex_dirs := 
define _run_apex_sepolicy_tests

define _run_apex_sepolicy_tests

$2: $1 \

$2: $1 \

    $(HOST_OUT_EXECUTABLES)/apex_sepolicy_tests \

    $(HOST_OUT_EXECUTABLES)/apex_sepolicy_tests \

    $(HOST_OUT_EXECUTABLES)/deapexer \

    $(HOST_OUT_EXECUTABLES)/apex-ls

    $(HOST_OUT_EXECUTABLES)/debugfs_static

	@rm -rf $$@

	@rm -rf $$@

	@mkdir -p $(dir $$@)

	@mkdir -p $(dir $$@)

	$(HOST_OUT_EXECUTABLES)/apex_sepolicy_tests --all -f <($(HOST_OUT_EXECUTABLES)/deapexer --debugfs_path $(HOST_OUT_EXECUTABLES)/debugfs_static list -Z $$<)

	$(HOST_OUT_EXECUTABLES)/apex_sepolicy_tests --all -f <($(HOST_OUT_EXECUTABLES)/apex-ls -Z $$<)

	@touch $$@

	@touch $$@

endef

endef