diff --git a/private/file_contexts b/private/file_contexts index f6e8e6bfe2d5575c308458a74ae5227a6a919614..d547a9f52d1b72228824838a79b431dfbde2c673 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 1fb648bbe985a3e591678714a8cfb3a6b84c341f..24c869678d227e1b965fbf0f0b51beb415892b82 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 2d02e8699f28776cc832eaa8ca7e62fbc4e67bf1..813340195bd05923d782cd27cb92ef97e92c37a1 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