commit d7bc087ed24ba49f5a762cd05d7016ee52035e96
author Nick Kralevich <nnk@google.com> Thu Sep 19 08:37:58 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 19 08:37:58 2013 -0700
tree 7dff5679e4d9c41bcd07484f79c69e8d4f5cfcde
parent bb5ebd3fcf1638cc56f65b24bf76517b3bd8fa9f
parent cf88d9ffda976bd173ceb654052a1d0d1f1d01d6

am cf88d9ff: am e60965a5: Merge "Move sepolicy declarations to common board file."

* commit 'cf88d9ffda976bd173ceb654052a1d0d1f1d01d6':
  Move sepolicy declarations to common board file.

BoardConfig.mk

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 097eec1..b585a21 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -42,22 +42,3 @@
 
 TARGET_RECOVERY_FSTAB = device/asus/grouper/fstab.grouper
 
-BOARD_SEPOLICY_DIRS := \
-        device/asus/grouper/sepolicy
-
-BOARD_SEPOLICY_UNION := \
-        file_contexts \
-        genfs_contexts \
-        app.te \
-        btmacreader.te \
-        device.te \
-        drmserver.te \
-        init_shell.te \
-        file.te \
-        rild.te \
-        sensors_config.te \
-        shell.te \
-        surfaceflinger.te \
-        system_app.te \
-        system_server.te \
-        zygote.te

BoardConfigCommon.mk

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index a11128c..0fbd3e0 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -77,3 +77,23 @@
 NEED_WORKAROUND_CORTEX_A9_745320 := true
 
 BOARD_USES_GROUPER_MODULES := true
+
+BOARD_SEPOLICY_DIRS += \
+        device/asus/grouper/sepolicy
+
+BOARD_SEPOLICY_UNION += \
+        file_contexts \
+        genfs_contexts \
+        app.te \
+        btmacreader.te \
+        device.te \
+        drmserver.te \
+        init_shell.te \
+        file.te \
+        rild.te \
+        sensors_config.te \
+        shell.te \
+        surfaceflinger.te \
+        system_app.te \
+        system_server.te \
+        zygote.te