Rename sdkext sepolicy to sdkextensions
The module is getting renamed, so rename all the policy
relating to it at the same time.
Bug: 137191822
Test: presubmit
Change-Id: Ia9d966ca9884ce068bd96cf5734e4a459158c85b
Merged-In: Ia9d966ca9884ce068bd96cf5734e4a459158c85b
(cherry picked from commit 6505573c36dcc6153af37895e968400f722119ea)
diff --git a/apex/Android.bp b/apex/Android.bp
index 29c2518..1c27bc3 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -28,6 +28,13 @@
}
filegroup {
+ name: "com.android.sdkext-file_contexts",
+ srcs: [
+ "com.android.sdkext-file_contexts",
+ ],
+}
+
+filegroup {
name: "com.android.art.debug-file_contexts",
srcs: [
"com.android.art.debug-file_contexts",
@@ -133,13 +140,6 @@
}
filegroup {
- name: "com.android.sdkext-file_contexts",
- srcs: [
- "com.android.sdkext-file_contexts",
- ],
-}
-
-filegroup {
name: "com.android.telephony-file_contexts",
srcs: [
"com.android.telephony-file_contexts",
diff --git a/private/compat/29.0/29.0.ignore.cil b/private/compat/29.0/29.0.ignore.cil
index 77f0ce0..07ceabd 100644
--- a/private/compat/29.0/29.0.ignore.cil
+++ b/private/compat/29.0/29.0.ignore.cil
@@ -47,7 +47,7 @@
linker_prop
linkerconfig_file
mock_ota_prop
- module_sdkext_prop
+ module_sdkextensions_prop
ota_metadata_file
ota_prop
art_apex_dir
diff --git a/private/derive_sdk.te b/private/derive_sdk.te
index 98cda20..1f60e34 100644
--- a/private/derive_sdk.te
+++ b/private/derive_sdk.te
@@ -8,5 +8,5 @@
allow derive_sdk apex_mnt_dir:dir r_dir_perms;
# Prop rules: writable by derive_sdk, readable by bootclasspath (apps)
-set_prop(derive_sdk, module_sdkext_prop)
-neverallow {domain -init -derive_sdk} module_sdkext_prop:property_service set;
+set_prop(derive_sdk, module_sdkextensions_prop)
+neverallow { domain -init -derive_sdk } module_sdkextensions_prop:property_service set;
diff --git a/private/domain.te b/private/domain.te
index defe99d..907d1b8 100644
--- a/private/domain.te
+++ b/private/domain.te
@@ -45,8 +45,8 @@
# Allow to read properties for linker
get_prop(domain, linker_prop);
-# Read access to sdkext props
-get_prop(domain, module_sdkext_prop)
+# Read access to sdkextensions props
+get_prop(domain, module_sdkextensions_prop)
# For now, everyone can access core property files
# Device specific properties are not granted by default
diff --git a/private/property_contexts b/private/property_contexts
index b2b6abc..faa425b 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -226,5 +226,5 @@
ota.warm_reset u:object_r:ota_prop:s0
# Module properties
-com.android.sdkext. u:object_r:module_sdkext_prop:s0
-persist.com.android.sdkext. u:object_r:module_sdkext_prop:s0
+com.android.sdkext. u:object_r:module_sdkextensions_prop:s0
+persist.com.android.sdkext. u:object_r:module_sdkextensions_prop:s0
diff --git a/public/property.te b/public/property.te
index bfb78c4..f2bf870 100644
--- a/public/property.te
+++ b/public/property.te
@@ -60,7 +60,7 @@
# Properties which can't be written outside system
system_restricted_prop(linker_prop)
-system_restricted_prop(module_sdkext_prop)
+system_restricted_prop(module_sdkextensions_prop)
system_restricted_prop(nnapi_ext_deny_product_prop)
system_restricted_prop(restorecon_prop)
system_restricted_prop(system_boot_reason_prop)
@@ -630,7 +630,7 @@
-heapprofd_prop
-hwservicemanager_prop
-last_boot_reason_prop
- -module_sdkext_prop
+ -module_sdkextensions_prop
-system_lmk_prop
-linker_prop
-log_prop
diff --git a/public/property_contexts b/public/property_contexts
index e2b2c00..22288db 100644
--- a/public/property_contexts
+++ b/public/property_contexts
@@ -253,10 +253,10 @@
ro.build.user u:object_r:exported2_default_prop:s0 exact string
ro.build.version.base_os u:object_r:exported2_default_prop:s0 exact string
ro.build.version.codename u:object_r:exported2_default_prop:s0 exact string
+ro.build.version.extensions. u:object_r:module_sdkextensions_prop:s0 prefix int
ro.build.version.incremental u:object_r:exported2_default_prop:s0 exact string
ro.build.version.preview_sdk u:object_r:exported2_default_prop:s0 exact int
ro.build.version.release u:object_r:exported2_default_prop:s0 exact string
-ro.build.version.extensions. u:object_r:module_sdkext_prop:s0 prefix int
ro.build.version.sdk u:object_r:exported2_default_prop:s0 exact int
ro.build.version.security_patch u:object_r:exported2_default_prop:s0 exact string
ro.crypto.state u:object_r:exported_vold_prop:s0 exact string
diff --git a/public/vendor_init.te b/public/vendor_init.te
index 0bdfc4a..4af41ee 100644
--- a/public/vendor_init.te
+++ b/public/vendor_init.te
@@ -221,7 +221,7 @@
-nnapi_ext_deny_product_prop
-init_svc_debug_prop
-linker_prop
- -module_sdkext_prop
+ -module_sdkextensions_prop
-userspace_reboot_exported_prop
-userspace_reboot_prop
-vndk_prop