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

Commit ce5eb452 authored by Anton Hansson's avatar Anton Hansson
Browse files

Include partition-split selinux_policy modules. 

The selinux_policy module has been split in two, so that the system
artifacts can be included separately. Also remove associated whitelist
entries.

Bug: 80410283
Test: for t in eng userdebug user; do lunch mainline_arm64-${t}; m nothing; done
Change-Id: Id704c907b1ed31ae49697d33f075c013bc3dfc8c
Merged-In: Id704c907b1ed31ae49697d33f075c013bc3dfc8c
parent 71173113

target/product/base_system.mk

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ PRODUCT_PACKAGES += \ 
    screencap \

    sdcard \

    secdiscard \

    selinux_policy \

    selinux_policy_system \

    sensorservice \

    service \

    servicemanager \

target/product/base_vendor.mk

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ PRODUCT_PACKAGES += \ 
    libril \

    libvisualizer \

    passwd \

    selinux_policy_nonsystem \

    shell_and_utilities_vendor \

    vndservice \

    vndservicemanager \

target/product/mainline_system.mk

+0 −14
Original line number Diff line number Diff line
@@ -21,21 +21,7 @@ PRODUCT_NAME := mainline_system 
PRODUCT_BRAND := generic

PRODUCT_SHIPPING_API_LEVEL := 28



_selinux_policy_whitelist := \

  vendor/etc/selinux/vndservice_contexts \

  vendor/etc/selinux/plat_pub_versioned.cil \

  vendor/etc/selinux/plat_sepolicy_vers.txt \

  vendor/etc/selinux/precompiled_sepolicy \

  vendor/etc/selinux/precompiled_sepolicy.plat_and_mapping.sha256 \

  vendor/etc/selinux/vendor_file_contexts \

  vendor/etc/selinux/vendor_hwservice_contexts \

  vendor/etc/selinux/vendor_mac_permissions.xml \

  vendor/etc/selinux/vendor_property_contexts \

  vendor/etc/selinux/vendor_seapp_contexts \

  vendor/etc/selinux/vendor_sepolicy.cil \



_base_mk_whitelist := \

  $(_selinux_policy_whitelist) \

  recovery/root/etc/mke2fs.conf \

  root/init \

  root/init.environ.rc \