Merge "gmscore_app: suppress denials for system_data_file"
diff --git a/apex/Android.bp b/apex/Android.bp
index 19a44c7..6caeb0c 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -145,3 +145,10 @@
     "com.android.vndk-file_contexts",
   ],
 }
+
+filegroup {
+  name: "com.android.wifi-file_contexts",
+  srcs: [
+    "com.android.wifi-file_contexts",
+  ],
+}
diff --git a/private/gsid.te b/private/gsid.te
index 306efb8..4771311 100644
--- a/private/gsid.te
+++ b/private/gsid.te
@@ -36,6 +36,10 @@
 # file names.
 r_dir_file(gsid, sysfs_dm)
 
+# libfiemap_writer needs to read /sys/fs/f2fs/<dev>/features to determine
+# whether pin_file support is enabled.
+r_dir_file(gsid, sysfs_fs_f2fs)
+
 # Needed to read fstab, which is used to validate that system verity does not
 # use check_once_at_most for sdcard installs. (Note: proc_cmdline is needed
 # to get the A/B slot suffix).
diff --git a/private/init.te b/private/init.te
index 463f098..116eff4 100644
--- a/private/init.te
+++ b/private/init.te
@@ -15,6 +15,7 @@
   domain_trans(init, rootfs, charger)
   domain_trans(init, rootfs, fastbootd)
   domain_trans(init, rootfs, recovery)
+  domain_trans(init, rootfs, linkerconfig)
 ')
 domain_trans(init, shell_exec, shell)
 domain_trans(init, init_exec, ueventd)