commit 0cb417a6392c63e9670c2718fcb5e2f485d9baa4
author Jeff Vander Stoep <jeffv@google.com> Wed Mar 08 14:12:54 2017 -0800
committer Jeffrey Vander Stoep <jeffv@google.com> Fri Mar 10 22:11:35 2017 +0000
tree fb82a85c49ba512b2f07309f305c6e901a2d7e37
parent 84aa74218421f8d2dbad1408ba114f680331ace0

Move split file_contexts to /system and /vendor

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: Ide8498b3c86234d2f93bb22a7514d132c33067d6

Android.mk

diff --git a/Android.mk b/Android.mk
index 39b9715..f85db37 100644
--- a/Android.mk
+++ b/Android.mk
@@ -703,7 +703,7 @@
 LOCAL_MODULE := plat_file_contexts
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
+LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/selinux
 
 include $(BUILD_SYSTEM)/base_rules.mk
 
@@ -733,7 +733,7 @@
 LOCAL_MODULE := nonplat_file_contexts
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc/selinux
 
 include $(BUILD_SYSTEM)/base_rules.mk