commit 1b9fb5a836a02bc90d47654fff65d40b31395007
author Jeff Vander Stoep <jeffv@google.com> Sat Mar 11 00:06:55 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Mar 11 00:06:55 2017 +0000
tree 6f6430b48cd5cf018ffcaf338494e6ff8e2b7ed2
parent b9bad0c3db6bb8efe3b20a6e92db02629ecee048
parent 591605001bf02bc50a13cf5c3b4fd80c394f6601

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

Change-Id: Ia62229843dfa0d1ef176f7adc9138f481f3d8cf7

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.