diff options
| author | 2025-01-10 16:24:53 -0800 | |
|---|---|---|
| committer | 2025-01-10 16:24:53 -0800 | |
| commit | fef026e1694791c16ef9ebfd812154174fb99f34 (patch) | |
| tree | 0eaad07c00332a71489794cdfed7daddfc26b7ef | |
| parent | 5c87b6868e02664ec50e105f96b38620fd2ca876 (diff) | |
| parent | 7f50a123045520f2c5e18e9eb4e83f92244a1459 (diff) | |
Merge "Run apex_sepolicy_tests with erofs apexes" into main
| -rw-r--r-- | core/Makefile | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/core/Makefile b/core/Makefile index 80ad33c8d6..c56c7823ca 100644 --- a/core/Makefile +++ b/core/Makefile @@ -5159,8 +5159,7 @@ 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)) +ifneq (,$(filter ext4 erofs,$(PRODUCT_DEFAULT_APEX_PAYLOAD_TYPE))) intermediate := $(call intermediates-dir-for,PACKAGING,apex_sepolicy_tests) apex_dirs := \ $(TARGET_OUT)/apex/% \ @@ -5177,11 +5176,10 @@ apex_dirs := define _run_apex_sepolicy_tests $2: $1 \ $(HOST_OUT_EXECUTABLES)/apex_sepolicy_tests \ - $(HOST_OUT_EXECUTABLES)/deapexer \ - $(HOST_OUT_EXECUTABLES)/debugfs_static + $(HOST_OUT_EXECUTABLES)/apex-ls @rm -rf $$@ @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 $$@ endef |