From d8c6712f5b77e83e1df8475bef8bcb9afc56114b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Wagner?= <jorwag@google.com>
Date: Tue, 27 Dec 2022 14:28:56 +0000
Subject: [PATCH] Update Mali DDK to r40 : Additional SELinux settings

Expose DDK's dynamic configuration options through the Android Sysprop
interface, following recommendations from Arm's Android Integration
Manual.

Bug: 261718474

(cherry picked from commit 6834d6f59faed8ae4853853ed1fedbf4eb84069f)
Merged-In: I785106b6d2d05e21bf60fcd6da3d716b32e1bc1d
Change-Id: I0469e2f24abe7a9458305d5752ae655cf4f42547
---
 legacy/whitechapel_pro/property.te       | 3 +++
 legacy/whitechapel_pro/property_contexts | 3 +++
 vendor/domain.te                         | 3 +++
 vendor/vendor_init.te                    | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/legacy/whitechapel_pro/property.te b/legacy/whitechapel_pro/property.te
index 0eabc734..b5838a9f 100644
--- a/legacy/whitechapel_pro/property.te
+++ b/legacy/whitechapel_pro/property.te
@@ -13,3 +13,6 @@ system_vendor_config_prop(vendor_uwb_calibration_prop)
 
 # Trusty storage FS ready
 vendor_internal_prop(vendor_trusty_storage_prop)
+
+# Mali Integration
+vendor_public_prop(vendor_arm_runtime_option_prop)
diff --git a/legacy/whitechapel_pro/property_contexts b/legacy/whitechapel_pro/property_contexts
index fa5c9170..6faf2397 100644
--- a/legacy/whitechapel_pro/property_contexts
+++ b/legacy/whitechapel_pro/property_contexts
@@ -20,3 +20,6 @@ ro.vendor.uwb.calibration.                 u:object_r:vendor_uwb_calibration_pro
 
 # Trusty
 ro.vendor.trusty.storage.fs_ready          u:object_r:vendor_trusty_storage_prop:s0
+
+# Mali GPU driver configuration and debug options
+vendor.mali.                               u:object_r:vendor_arm_runtime_option_prop:s0 prefix
diff --git a/vendor/domain.te b/vendor/domain.te
index fd876e09..a8bad53f 100644
--- a/vendor/domain.te
+++ b/vendor/domain.te
@@ -1,2 +1,5 @@
 allow {domain -appdomain -rs} proc_vendor_sched:dir r_dir_perms;
 allow {domain -appdomain -rs} proc_vendor_sched:file w_file_perms;
+
+# Mali
+get_prop(domain, vendor_arm_runtime_option_prop)
diff --git a/vendor/vendor_init.te b/vendor/vendor_init.te
index a55046b6..98212252 100644
--- a/vendor/vendor_init.te
+++ b/vendor/vendor_init.te
@@ -27,3 +27,6 @@ set_prop(vendor_init, vendor_secure_element_prop)
 set_prop(vendor_init, vendor_usb_config_prop)
 
 set_prop(vendor_init, vendor_ssrdump_prop)
+
+# Mali
+set_prop(vendor_init, vendor_arm_runtime_option_prop)