Skip to content
Snippets Groups Projects
Commit c96721ea authored by Dan Cashman's avatar Dan Cashman
Browse files

Include 26.0 compat file on system image.

This file is necessary for using an mr1 system image in conjunction
with an oc-dev vendor image.  This is currently needed by GSI testing,
for example.

(cherry-pick of commit: 03596f28)

Bug: 66358348
Test: File is included on system image.
Change-Id: Ie694061d08acf17453feb596480e42974f8c714c
parent 61424ee7
No related branches found
No related tags found
No related merge requests found
...@@ -197,6 +197,7 @@ ifeq ($(PRODUCT_FULL_TREBLE),true) ...@@ -197,6 +197,7 @@ ifeq ($(PRODUCT_FULL_TREBLE),true)
# Use split SELinux policy # Use split SELinux policy
LOCAL_REQUIRED_MODULES += \ LOCAL_REQUIRED_MODULES += \
$(platform_mapping_file) \ $(platform_mapping_file) \
26.0.cil \
nonplat_sepolicy.cil \ nonplat_sepolicy.cil \
plat_sepolicy.cil \ plat_sepolicy.cil \
plat_and_mapping_sepolicy.cil.sha256 \ plat_and_mapping_sepolicy.cil.sha256 \
...@@ -412,6 +413,16 @@ current_mapping.cil := ...@@ -412,6 +413,16 @@ current_mapping.cil :=
################################# #################################
include $(CLEAR_VARS) 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 := plat_and_mapping_sepolicy.cil.sha256
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment