Rename the context for the ART APEX.
Test: Boot (with default flattened APEXes)
Bug: 135753770
Change-Id: I551e88a250d3bd891f63a6bccee0682d0d0de7cf
diff --git a/private/compat/26.0/26.0.ignore.cil b/private/compat/26.0/26.0.ignore.cil
index 9ab631a..15746a2 100644
--- a/private/compat/26.0/26.0.ignore.cil
+++ b/private/compat/26.0/26.0.ignore.cil
@@ -136,7 +136,7 @@
recovery_socket
role_service
runas_app
- runtime_apex_dir
+ art_apex_dir
runtime_service
secure_element
secure_element_device
diff --git a/private/compat/27.0/27.0.ignore.cil b/private/compat/27.0/27.0.ignore.cil
index a3f30d4..fa8d9fe 100644
--- a/private/compat/27.0/27.0.ignore.cil
+++ b/private/compat/27.0/27.0.ignore.cil
@@ -123,7 +123,7 @@
recovery_socket
role_service
runas_app
- runtime_apex_dir
+ art_apex_dir
runtime_service
secure_element
secure_element_device
diff --git a/private/compat/28.0/28.0.ignore.cil b/private/compat/28.0/28.0.ignore.cil
index 70ca252..19ab79a 100644
--- a/private/compat/28.0/28.0.ignore.cil
+++ b/private/compat/28.0/28.0.ignore.cil
@@ -115,7 +115,7 @@
rss_hwm_reset_exec
runas_app
runas_app_tmpfs
- runtime_apex_dir
+ art_apex_dir
runtime_service
sdcard_block_device
sensor_privacy_service
diff --git a/private/compat/29.0/29.0.ignore.cil b/private/compat/29.0/29.0.ignore.cil
index 24c733b..f91f22e 100644
--- a/private/compat/29.0/29.0.ignore.cil
+++ b/private/compat/29.0/29.0.ignore.cil
@@ -16,7 +16,7 @@
init_svc_debug_prop
linker_prop
ota_metadata_file
- runtime_apex_dir
+ art_apex_dir
system_ashmem_hwservice
system_group_file
system_passwd_file
diff --git a/private/file_contexts b/private/file_contexts
index 85c2f60..bd91519 100644
--- a/private/file_contexts
+++ b/private/file_contexts
@@ -180,7 +180,7 @@
# System files
#
/system(/.*)? u:object_r:system_file:s0
-/system/apex/com.android.art u:object_r:runtime_apex_dir:s0
+/system/apex/com.android.art u:object_r:art_apex_dir:s0
/system/lib(64)?(/.*)? u:object_r:system_lib_file:s0
/system/lib(64)?/bootstrap(/.*)? u:object_r:system_bootstrap_lib_file:s0
/system/bin/atrace u:object_r:atrace_exec:s0
diff --git a/public/file.te b/public/file.te
index 97cd097..45c2fbc 100644
--- a/public/file.te
+++ b/public/file.te
@@ -175,8 +175,8 @@
type task_profiles_file, system_file_type, file_type;
# Vendor task profiles file under /vendor/etc/task_profiles.json
type vendor_task_profiles_file, vendor_file_type, file_type;
-# Type for /system/apex/com.android.runtime
-type runtime_apex_dir, system_file_type, file_type;
+# Type for /system/apex/com.android.art
+type art_apex_dir, system_file_type, file_type;
# Default type for directories search for
# HAL implementations
diff --git a/public/init.te b/public/init.te
index 319b3dc..4f8e855 100644
--- a/public/init.te
+++ b/public/init.te
@@ -103,8 +103,8 @@
# Mount tmpfs on /apex
allow init apex_mnt_dir:dir mounton;
-# Bind-mount on /system/apex/com.android.runtime
-allow init runtime_apex_dir:dir mounton;
+# Bind-mount on /system/apex/com.android.art
+allow init art_apex_dir:dir mounton;
# Create and remove symlinks in /.
allow init rootfs:lnk_file { create unlink };