commit fab96b9a3795ac37e24933e3b7bf03a6b3ad174f
author Treehugger Robot <treehugger-gerrit@google.com> Mon Oct 02 22:54:13 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 02 22:54:13 2017 +0000
tree 20de49236eb3eb93de8638b16a9cfdf71aa0c010
parent f58d179569a6270d4f22b0b187905fb29e699117
parent f9cd76b1d80ade34c5e7c49f502837fbf86a2355

Merge "Include 26.0 compat file on system image."

Android.mk

diff --git a/Android.mk b/Android.mk
index cb67f72..f320381 100644
--- a/Android.mk
+++ b/Android.mk
@@ -190,6 +190,7 @@
 # Use split SELinux policy
 LOCAL_REQUIRED_MODULES += \
     $(platform_mapping_file) \
+    26.0.cil \
     nonplat_sepolicy.cil \
     plat_sepolicy.cil \
     plat_and_mapping_sepolicy.cil.sha256 \
@@ -405,6 +406,16 @@
 #################################
 include $(CLEAR_VARS)
 
+LOCAL_MODULE := 26.0.cil
+LOCAL_SRC_FILES := private/compat/26.0/26.0.cil
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/selinux/mapping
+
+include $(BUILD_PREBUILT)
+#################################
+include $(CLEAR_VARS)
+
 LOCAL_MODULE := plat_and_mapping_sepolicy.cil.sha256
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_TAGS := optional