From e64edff159f2f8b91ba99cb3c8e007a130a1cd1c Mon Sep 17 00:00:00 2001 From: Jiyong Park <jiyong@google.com> Date: Thu, 8 Mar 2018 02:53:45 +0900 Subject: [PATCH] /odm is another vendor partition other than /vendor Sub directories under /odm (or /vendor/odm when there isn't an odm partition) are labeled so that artifacts under the sub directories are treated the same as their counterpart in the vendor partition. For example, /odm/app/* is labeled as vendor_app_file just like /vendor/app/*. Bug: 71366495 Test: m -j Merged-In: I72a14fd55672cd2867edd88ced9828ea49726694 Change-Id: I72a14fd55672cd2867edd88ced9828ea49726694 (cherry picked from commit 2f1015512d6d339d68da16d553c44e22631d1ec1) --- private/file_contexts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/private/file_contexts b/private/file_contexts index 5aa2f2550..e2d1aa7ab 100644 --- a/private/file_contexts +++ b/private/file_contexts @@ -319,10 +319,16 @@ ############################# # OEM and ODM files # -/odm(/.*)? u:object_r:vendor_file:s0 -/odm/lib(64)?/egl(/.*)? u:object_r:same_process_hal_file:s0 -/odm/lib(64)?/hw u:object_r:vendor_hal_file:s0 -/odm/lib(64)?/vndk-sp(/.*)? u:object_r:vndk_sp_file:s0 +/(odm|vendor/odm)(/.*)? u:object_r:vendor_file:s0 +/(odm|vendor/odm)/lib(64)?/egl(/.*)? u:object_r:same_process_hal_file:s0 +/(odm|vendor/odm)/lib(64)?/hw u:object_r:vendor_hal_file:s0 +/(odm|vendor/odm)/lib(64)?/vndk-sp(/.*)? u:object_r:vndk_sp_file:s0 +/(odm|vendor/odm)/bin/sh u:object_r:vendor_shell_exec:s0 +/(odm|vendor/odm)/etc(/.*)? u:object_r:vendor_configs_file:s0 +/(odm|vendor/odm)/app(/.*)? u:object_r:vendor_app_file:s0 +/(odm|vendor/odm)/priv-app(/.*)? u:object_r:vendor_app_file:s0 +/(odm|vendor/odm)/overlay(/.*)? u:object_r:vendor_overlay_file:s0 +/(odm|vendor/odm)/framework(/.*)? u:object_r:vendor_framework_file:s0 /oem(/.*)? u:object_r:oemfs:s0 -- GitLab