Split system_aconfig_storage_file regex
The file_contexts evaluation order implied that some entries (i.e.,
/system_ext/etc/aconfig and /product/etc/aconfig) did not receive the
correct label. Split and re-order the entries.
Bug: 299839280
Test: checkfc -t ./private/file_contexts ./contexts/plat_file_contexts_test
Change-Id: I3f7d02d37df7857b119e3b53a4a47dd883f4891a
diff --git a/private/file_contexts b/private/file_contexts
index 25ed6e8..fa2fe3a 100644
--- a/private/file_contexts
+++ b/private/file_contexts
@@ -362,7 +362,7 @@
/system/bin/virtual_camera u:object_r:virtual_camera_exec:s0
/system/bin/hw/android\.frameworks\.bufferhub@1\.0-service u:object_r:fwk_bufferhub_exec:s0
/system/bin/hw/android\.system\.suspend-service u:object_r:system_suspend_exec:s0
-/(system|system_ext|product)/etc/aconfig(/.*)? u:object_r:system_aconfig_storage_file:s0
+/system/etc/aconfig(/.*)? u:object_r:system_aconfig_storage_file:s0
/system/etc/cgroups\.json u:object_r:cgroup_desc_file:s0
/system/etc/task_profiles/cgroups_[0-9]+\.json u:object_r:cgroup_desc_api_file:s0
/system/etc/event-log-tags u:object_r:system_event_log_tags_file:s0
@@ -508,6 +508,7 @@
/(product|system/product)/lib(64)?(/.*)? u:object_r:system_lib_file:s0
/(product|system/product)/etc/security/adb_keys u:object_r:adb_keys_file:s0
+/(product|system/product)/etc/aconfig(/.*)? u:object_r:system_aconfig_storage_file:s0
#############################
# SystemExt files
@@ -539,6 +540,8 @@
/(system_ext|system/system_ext)/lib(64)?(/.*)? u:object_r:system_lib_file:s0
+/(system_ext|system/system_ext)/etc/aconfig(/.*)? u:object_r:system_aconfig_storage_file:s0
+
#############################
# VendorDlkm files
# This includes VENDOR Dynamically Loadable Kernel Modules and other misc files.