From 00cf2fbe50449e293a28df6adcd29b5a94f02c35 Mon Sep 17 00:00:00 2001
From: Kiyoung Kim <kiyoungkim@google.com>
Date: Fri, 22 Nov 2019 14:56:10 +0900
Subject: [PATCH] Move linker config under /linkerconfig

Currently linker config locates under /dev, but this makes some problem
in case of using two system partitions using chroot. To match system
image and configuration, linker config better stays under /linkerconfig

Bug: 144966380
Test: m -j passed && tested from cuttlefish
Change-Id: Iea67663442888c410f29f8dd0c44fe49e3fcef94
---
 private/compat/29.0/29.0.ignore.cil | 1 +
 private/file.te                     | 3 ---
 private/file_contexts               | 5 ++++-
 public/file.te                      | 2 ++
 public/init.te                      | 1 +
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/private/compat/29.0/29.0.ignore.cil b/private/compat/29.0/29.0.ignore.cil
index 383ff3c65..eabf6724c 100644
--- a/private/compat/29.0/29.0.ignore.cil
+++ b/private/compat/29.0/29.0.ignore.cil
@@ -31,6 +31,7 @@
     mediatranscoding_exec
     mediatranscoding_tmpfs
     linker_prop
+    linkerconfig_file
     mock_ota_prop
     ota_metadata_file
     ota_prop
diff --git a/private/file.te b/private/file.te
index 09bfe29e6..44920029c 100644
--- a/private/file.te
+++ b/private/file.te
@@ -21,9 +21,6 @@ typealias app_exec_data_file alias rs_data_file;
 # of application data.
 type rollback_data_file, file_type, data_file_type, core_data_file_type;
 
-# /dev/linkerconfig(/.*)?
-type linkerconfig_file, file_type;
-
 # /data/gsi/ota
 type ota_image_data_file, file_type, data_file_type, core_data_file_type;
 
diff --git a/private/file_contexts b/private/file_contexts
index 69b6c58e0..f95f8d8dd 100644
--- a/private/file_contexts
+++ b/private/file_contexts
@@ -101,7 +101,6 @@
 /dev/iio:device[0-9]+   u:object_r:iio_device:s0
 /dev/ion		u:object_r:ion_device:s0
 /dev/keychord   u:object_r:keychord_device:s0
-/dev/linkerconfig(/.*)? u:object_r:linkerconfig_file:s0
 /dev/loop-control	u:object_r:loop_control_device:s0
 /dev/modem.*		u:object_r:radio_device:s0
 /dev/mtp_usb		u:object_r:mtp_device:s0
@@ -179,6 +178,10 @@
 /dev/__properties__ u:object_r:properties_device:s0
 /dev/__properties__/property_info   u:object_r:property_info:s0
 #############################
+# Linker configuration
+#
+/linkerconfig(/.*)?          u:object_r:linkerconfig_file:s0
+#############################
 # System files
 #
 /system(/.*)?		u:object_r:system_file:s0
diff --git a/public/file.te b/public/file.te
index 401e01666..83906923b 100644
--- a/public/file.te
+++ b/public/file.te
@@ -179,6 +179,8 @@ type task_profiles_file, system_file_type, file_type;
 type vendor_task_profiles_file, vendor_file_type, file_type;
 # Type for /system/apex/com.android.art
 type art_apex_dir, system_file_type, file_type;
+# /linkerconfig(/.*)?
+type linkerconfig_file, file_type;
 
 # Default type for directories search for
 # HAL implementations
diff --git a/public/init.te b/public/init.te
index 2d0db1e3d..ec47e544c 100644
--- a/public/init.te
+++ b/public/init.te
@@ -86,6 +86,7 @@ allow init {
     rootfs
     cache_file
     cgroup
+    linkerconfig_file
     storage_file
     mnt_user_file
     system_data_file