commit 7ba90163da4a49996d013c61877f83cca457b360
author Jeff Vander Stoep <jeffv@google.com> Fri Mar 10 23:59:48 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 10 23:59:48 2017 +0000
tree b7c5cc14d46877ddf5c8566ec58053abc41af609
parent 0a8456fa3c55b1e10938575892501990f7b80292
parent de6286ebaa0687f2e966787950b1b44e7ae04823

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

Change-Id: I76eacc102235ba5b989a15f678c8ecbf5b744ff8

init/Android.mk

diff --git a/init/Android.mk b/init/Android.mk
index 5bcfb7b..1a47eb4 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -120,7 +120,9 @@
     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 @@
 
 else
 # Use monolithic SELinux policy
-LOCAL_REQUIRED_MODULES += sepolicy
+LOCAL_REQUIRED_MODULES += sepolicy \
+    file_contexts.bin
 endif
 
 # Create symlinks.