commit 00cac07f11386057868ee7b33a37c08bcde5784b
author Treehugger Robot <treehugger-gerrit@google.com> Tue Oct 03 02:01:40 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 03 02:01:40 2017 +0000
tree bfdeafe1ebfc41ad880bc6fb4fa9edc44d4ce8ab
parent fab96b9a3795ac37e24933e3b7bf03a6b3ad174f
parent 41ce23481c39bfe9a7e4ff4a1089d1782ea3c7dd

Merge "Revert "Include 26.0 compat file on system image.""

Android.mk

diff --git a/Android.mk b/Android.mk
index f320381..cb67f72 100644
--- a/Android.mk
+++ b/Android.mk
@@ -190,7 +190,6 @@
 # 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 \
@@ -406,16 +405,6 @@
 #################################
 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