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

Commit 0cbbb838 authored by Jeff Vander Stoep's avatar Jeff Vander Stoep
Browse files

Build split file_contexts on TREBLE builds 

Build file_contexts.bin on legacy builds.
Test: Marlin and Bullhead build and boot with no new denials.
Test: Marlin and Bullhead recovery boots with no new denials.
Test: Bullhead boots with file_contexts.bin in /
Test: Marlin boot with /system/etc/selinux/plat_file_contexts and
      /vendor/etc/selinux/nonplat_file_contexts.
Bug: 36002414

Change-Id: I66f138fc3ad808df0480e0467cee03fd40177f31
parent dda9cbb3

init/Android.mk

+5 −2
Original line number Original line Diff line number Diff line
@@ -120,7 +120,9 @@ LOCAL_REQUIRED_MODULES += \ 
    nonplat_sepolicy.cil \

    nonplat_sepolicy.cil \

    plat_sepolicy.cil \

    plat_sepolicy.cil \

    plat_sepolicy.cil.sha256 \

    plat_sepolicy.cil.sha256 \

    secilc

    secilc \

    nonplat_file_contexts \

    plat_file_contexts





# Include precompiled policy, unless told otherwise

# Include precompiled policy, unless told otherwise

ifneq ($(PRODUCT_PRECOMPILED_SEPOLICY),false)

ifneq ($(PRODUCT_PRECOMPILED_SEPOLICY),false)
@@ -129,7 +131,8 @@ endif 




else

else

# Use monolithic SELinux policy

# Use monolithic SELinux policy

LOCAL_REQUIRED_MODULES += sepolicy

LOCAL_REQUIRED_MODULES += sepolicy \

    file_contexts.bin

endif

endif





# Create symlinks.

# Create symlinks.