From e72ed2adbe6dcb37d7815937c11302ffa9120aef Mon Sep 17 00:00:00 2001
From: Dmitry Muhomor <muhomor.dmitry@gmail.com>
Date: Thu, 7 Dec 2023 19:31:25 +0200
Subject: [PATCH] update prop removal

---
 config/device/common/removal.yml                           | 5 +++++
 .../google_devices/husky/proprietary/device-vendor.mk.skip | 5 -----
 .../google_devices/shiba/proprietary/device-vendor.mk.skip | 7 +------
 vendor-specs/google_devices/husky.yml                      | 2 +-
 vendor-specs/google_devices/shiba.yml                      | 2 +-
 5 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/config/device/common/removal.yml b/config/device/common/removal.yml
index 821eec7..92ba5a6 100644
--- a/config/device/common/removal.yml
+++ b/config/device/common/removal.yml
@@ -9,8 +9,13 @@ filters:
     match:
       # Debug
       - ro.adb.secure
+      # intentionally removed, see device/google/zuma commit
+      - ro.arm64.memtag.bootctl_supported
       - ro.camerax.extensions.enabled
     prefix:
+      # these props disable memory tagging for some of system processes
+      - persist.arm64.memtag.app.
+      - persist.arm64.memtag.system_server
       # APEX
       - ro.apex.updatable
       # Debug
diff --git a/vendor-skels/google_devices/husky/proprietary/device-vendor.mk.skip b/vendor-skels/google_devices/husky/proprietary/device-vendor.mk.skip
index 41d5186..8d96810 100644
--- a/vendor-skels/google_devices/husky/proprietary/device-vendor.mk.skip
+++ b/vendor-skels/google_devices/husky/proprietary/device-vendor.mk.skip
@@ -12,11 +12,6 @@ PRODUCT_PRODUCT_PROPERTIES += \
     ro.gwfcactivation.disabled_carriers=1492 \
     pixel_legel_joint_permission=true \
     pixel_legal_joint_permission=true \
-    ro.arm64.memtag.bootctl_supported=1 \
-    persist.arm64.memtag.app.com.android.se=off \
-    persist.arm64.memtag.app.com.google.android.bluetooth=off \
-    persist.arm64.memtag.app.com.android.nfc=off \
-    persist.arm64.memtag.system_server=off \
     ro.vendor.camera.extensions.package=com.google.android.apps.camera.services \
     ro.vendor.camera.extensions.service=com.google.android.apps.camera.services.extensions.service.PixelExtensions
 
diff --git a/vendor-skels/google_devices/shiba/proprietary/device-vendor.mk.skip b/vendor-skels/google_devices/shiba/proprietary/device-vendor.mk.skip
index e8a4f90..d3886da 100644
--- a/vendor-skels/google_devices/shiba/proprietary/device-vendor.mk.skip
+++ b/vendor-skels/google_devices/shiba/proprietary/device-vendor.mk.skip
@@ -13,12 +13,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
     pixel_legel_joint_permission=true \
     pixel_legal_joint_permission=true \
     ro.vendor.camera.extensions.package=com.google.android.apps.camera.services \
-    ro.vendor.camera.extensions.service=com.google.android.apps.camera.services.extensions.service.PixelExtensions \
-    ro.arm64.memtag.bootctl_supported=1 \
-    persist.arm64.memtag.app.com.android.se=off \
-    persist.arm64.memtag.app.com.google.android.bluetooth=off \
-    persist.arm64.memtag.app.com.android.nfc=off \
-    persist.arm64.memtag.system_server=off
+    ro.vendor.camera.extensions.service=com.google.android.apps.camera.services.extensions.service.PixelExtensions
 
 PRODUCT_VENDOR_PROPERTIES += \
     ro.build.expect.bootloader=ripcurrent-14.1-11012321 \
diff --git a/vendor-specs/google_devices/husky.yml b/vendor-specs/google_devices/husky.yml
index c5d5a77..af5c64a 100644
--- a/vendor-specs/google_devices/husky.yml
+++ b/vendor-specs/google_devices/husky.yml
@@ -86,7 +86,7 @@ proprietary: dir
 proprietary-files.txt: 082a47fefc5ffb592338cc77373e4c91899ecd935987620bd8b25a562d87451b
 proprietary/Android.bp: 0f93139f9fca8e140ccf4a07eb1a6520d9cbfa0cdd1a60b6150714c99ab5b233
 proprietary/BoardConfigVendor.mk: f7160559ce16ec3c8a9669d451d2c4c57d060824380503dde06666c073bb250c
-proprietary/device-vendor.mk: b8da4ee63a6cf30a6ac5dcd9ea498ec7dbfefc11f8ce7dcb73bfb0ef44a32be4
+proprietary/device-vendor.mk: 9701ce985af9769270ea4130930bbd636c330035c93c2c41abf08212e76688d4
 proprietary/linker-config-adevtool.json: 6b3c6b57416c259790eb479ca3bf9575437bc060fd7439a96b2826785f73bcfc
 proprietary/product: dir
 proprietary/product/etc: dir
diff --git a/vendor-specs/google_devices/shiba.yml b/vendor-specs/google_devices/shiba.yml
index 8b2ee20..db02cfd 100644
--- a/vendor-specs/google_devices/shiba.yml
+++ b/vendor-specs/google_devices/shiba.yml
@@ -85,7 +85,7 @@ proprietary: dir
 proprietary-files.txt: afbdc299c485fc02544c49bd3f7a146641ab8967238bd62da075af01e55608fd
 proprietary/Android.bp: 040ee9805c64aa9bf417de12f0c4456f477a369f26cd4a9a8681ed37dfa20ba1
 proprietary/BoardConfigVendor.mk: 7b93ae6cffd54d8514b4b64c7fb7c7fd5ea9d08103e76e1e523e52b1bac3adeb
-proprietary/device-vendor.mk: 6886a90d4408de4cde9787b640469861f79547cb99a093ef0c80a3eda50b86f7
+proprietary/device-vendor.mk: 0e9a80e4380651648b5f6f80c3c3b3a36f489574deb54fd408cd5d4e6856c5d3
 proprietary/linker-config-adevtool.json: 6b3c6b57416c259790eb479ca3bf9575437bc060fd7439a96b2826785f73bcfc
 proprietary/product: dir
 proprietary/product/etc: dir