commit b28ef5268828b17b5bda2c244faf92e3dc7bee1d
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Apr 10 17:45:52 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 10 17:45:54 2017 +0000
tree 5d01e6d2676f7a8e81119798db6fcf07deb779ca
parent ba23c8fa968a05a44d894b3b4fb3fe6f96fb7e5d
parent 3af3a13b3181f9dbeac563e0b35fb838d6c523db

Merge "sepolicy: Fix renderscript driver lookup" into oc-dev

private/file_contexts

diff --git a/private/file_contexts b/private/file_contexts
index f6e8e6b..d547a9f 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

public/domain.te

diff --git a/public/domain.te b/public/domain.te
index 2b1ba91..74b25f7 100644
--- a/public/domain.te
+++ b/public/domain.te
@@ -119,10 +119,10 @@
 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;
@@ -550,7 +550,7 @@
     -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 };
@@ -565,7 +565,7 @@
   } {
     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

public/file.te

diff --git a/public/file.te b/public/file.te
index 2d02e86..8133401 100644
--- a/public/file.te
+++ b/public/file.te
@@ -94,8 +94,8 @@
 # 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