commit bba9e7b92d903629c57dee02aa3675b27480a122
author Jeff Vander Stoep <jeffv@google.com> Fri Mar 10 15:51:23 2017 -0800
committer Jeffrey Vander Stoep <jeffv@google.com> Sat Mar 11 00:08:37 2017 +0000
tree 180e3d65a6337f2feb1543717b4d02bb760c8156
parent 0cb417a6392c63e9670c2718fcb5e2f485d9baa4

Split mac_permissions.xml to /system and /vendor

Test: Build and boot Marlin
Test: See the following in the logs:
01-01 02:10:28.756  1345  1345 D SELinuxMMAC: Using policy file /system/etc/selinux/plat_mac_permissions.xml
01-01 02:10:28.787  1345  1345 D SELinuxMMAC: Using policy file /vendor/etc/selinux/nonplat_mac_permissions.xml
Bug: 36003167

Change-Id: If17490a2a5d94bfea1fa6d282282d45d67e207e9

Android.mk

diff --git a/Android.mk b/Android.mk
index f85db37..647b9c5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -953,7 +953,7 @@
 LOCAL_MODULE := plat_mac_permissions.xml
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/security
+LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/selinux
 
 include $(BUILD_SYSTEM)/base_rules.mk
 
@@ -987,7 +987,7 @@
 LOCAL_MODULE := nonplat_mac_permissions.xml
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/security
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc/selinux
 
 include $(BUILD_SYSTEM)/base_rules.mk