Fixup union sepolicy

This change solve two issue: 1) Policies related to recovery should be only included in recovery policy 2) In CM trees the sepolicy dir was always bootable/recovery- twrp/sepolicy, even if recovery path was bootable/recovery Change-Id: I9466d22293074ba5f5240abe8b97a5d1bf30982d
tonirmv · Nov 5, 2015 · f591c87 · f591c87
1 parent 54e9c83
commit f591c87
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Android.mk b/Android.mk
@@ -17,7 +17,7 @@ LOCAL_PATH := $(call my-dir)
 ifdef project-path-for
     ifeq ($(LOCAL_PATH),$(call project-path-for,recovery))
         PROJECT_PATH_AGREES := true
-        BOARD_SEPOLICY_DIRS += bootable/recovery-twrp/sepolicy
+        BOARD_SEPOLICY_DIRS += $(call project-path-for,recovery)/sepolicy
     endif
 else
     ifeq ($(LOCAL_PATH),bootable/recovery)

diff --git a/sepolicy/twrp.te b/sepolicy/twrp.te
@@ -1 +1,4 @@
-permissive recovery;
+recovery_only(`
+  # Allow recovery to set permissive mode
+  permissive recovery;
+')