Merge "Build split file_contexts on TREBLE builds" am: 2d03e64b95 am: f695cd1ec6

am: 33af0dc04c

Change-Id: Ia62229843dfa0d1ef176f7adc9138f481f3d8cf7
This commit is contained in:
Jeff Vander Stoep 2017-03-11 00:06:55 +00:00 committed by android-build-merger
commit a5a8cebb0a

View file

@ -120,7 +120,9 @@ LOCAL_REQUIRED_MODULES += \
nonplat_sepolicy.cil \
plat_sepolicy.cil \
plat_sepolicy.cil.sha256 \
secilc
secilc \
nonplat_file_contexts \
plat_file_contexts
# Include precompiled policy, unless told otherwise
ifneq ($(PRODUCT_PRECOMPILED_SEPOLICY),false)
@ -129,7 +131,8 @@ endif
else
# Use monolithic SELinux policy
LOCAL_REQUIRED_MODULES += sepolicy
LOCAL_REQUIRED_MODULES += sepolicy \
file_contexts.bin
endif
# Create symlinks.