From ba23c8fa968a05a44d894b3b4fb3fe6f96fb7e5d Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Mon, 10 Apr 2017 13:37:40 +0900
Subject: [PATCH] Rename vndk-stable to vndk-sp (SP=Same-process)
The concept of VNDK-stable set is gone because they no longer need to be
stable across several Android releases. Instead, they are just small set
of system libraries (other than Low-Level NDK) that can be used by
same-process HALs. They need to be stable only during an Android release
as other VNDK libraries. However, since they are eligible for double
loading, we still need to distinguish those libs from other VNDK
libraries. So we give them a name vndk-sp, which means VNDK designed for
same-process HALs.
Bug: 37139956
Test: booting successful with vndk-sp libs in /vendor/lib(64)?/vndk-sp
Change-Id: I892c4514deb3c6c8006e3659bed1ad3363420732
---
private/file_contexts | 2 +-
public/domain.te | 10 +++++-----
public/file.te | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/private/file_contexts b/private/file_contexts
index f6e8e6bfe..d547a9f52 100644
--- a/private/file_contexts
+++ b/private/file_contexts
@@ -266,7 +266,7 @@
/(vendor|system/vendor)/lib(64)?/egl(/.*)? u:object_r:same_process_hal_file:s0
-/(vendor|system/vendor)/lib(64)?/vndk-stable(/.*)? u:object_r:vndk_stable_file:s0
+/(vendor|system/vendor)/lib(64)?/vndk-sp(/.*)? u:object_r:vndk_sp_file:s0
# TODO: b/36790901 move this to /vendor/etc
/(vendor|system/vendor)/manifest.xml u:object_r:vendor_configs_file:s0
diff --git a/public/domain.te b/public/domain.te
index 1fb648bbe..24c869678 100644
--- a/public/domain.te
+++ b/public/domain.te
@@ -119,10 +119,10 @@ allow domain vendor_hal_file:dir r_dir_perms;
allow domain same_process_hal_file:dir r_dir_perms;
allow domain same_process_hal_file:file { execute read open getattr };
-# Any process can load vndk-stable libraries, which are system libraries
+# Any process can load vndk-sp libraries, which are system libraries
# used by same process HALs
-allow domain vndk_stable_file:dir r_dir_perms;
-allow domain vndk_stable_file:file { execute read open getattr };
+allow domain vndk_sp_file:dir r_dir_perms;
+allow domain vndk_sp_file:file { execute read open getattr };
# All domains get access to /vendor/etc
allow domain vendor_configs_file:dir r_dir_perms;
@@ -546,7 +546,7 @@ full_treble_only(`
-coredata_in_vendor_violators
}
core_data_file_type
- -zoneinfo_data_file # VNDK stable API provided by libc
+ -zoneinfo_data_file # Stable API provided by libc
:{
file_class_set
} ~{ append getattr ioctl read write };
@@ -561,7 +561,7 @@ full_treble_only(`
} {
core_data_file_type
-system_data_file
- -zoneinfo_data_file # VNDK stable API provided by libc
+ -zoneinfo_data_file # Stable API provided by libc
}:dir *;
neverallow {
domain
diff --git a/public/file.te b/public/file.te
index 2d02e8699..813340195 100644
--- a/public/file.te
+++ b/public/file.te
@@ -94,8 +94,8 @@ type vendor_configs_file, vendor_file_type, file_type;
# Default type for all *same process* HALs.
# e.g. libEGL_xxx.so, android.hardware.graphics.mapper@2.0-impl.so
type same_process_hal_file, vendor_file_type, file_type;
-# Default type for vndk-stable libs. /vendor/lib/vndk-stable
-type vndk_stable_file, vendor_file_type, file_type;
+# Default type for vndk-sp libs. /vendor/lib/vndk-sp
+type vndk_sp_file, vendor_file_type, file_type;
# Default type for everything in /vendor/framework
type vendor_framework_file, vendor_file_type, file_type;
# Default type for everything in /vendor/overlay
--
GitLab