From aa76d5981a6dc0368156de74bd7e1be3cb425bea Mon Sep 17 00:00:00 2001 From: Mitch Phillips Date: Tue, 5 Mar 2024 13:17:10 +0000 Subject: [PATCH] Revert "Disable MTE on certain system processes that have it enabled by default" This reverts commit e3f2c1238c79a7d7ac3d98f42006cfa386b566f6. Reason for revert: Ineffective solution, ag/26456526 is the second attempt. Change-Id: If0ee19ba4cdce592c166c753317b5d78aafaf6d4 --- device-ripcurrent24.mk | 11 ----------- device-ripcurrentpro.mk | 11 ----------- 2 files changed, 22 deletions(-) diff --git a/device-ripcurrent24.mk b/device-ripcurrent24.mk index f6970e68..37d67c53 100644 --- a/device-ripcurrent24.mk +++ b/device-ripcurrent24.mk @@ -241,14 +241,3 @@ PRODUCT_VENDOR_PROPERTIES += \ # PKVM Memory Reclaim PRODUCT_VENDOR_PROPERTIES += \ hypervisor.memory_reclaim.supported=1 - -# Indicate that the bootloader supports the MTE developer option switch -# (MISC_MEMTAG_MODE_MEMTAG_ONCE), with the exception of _fullmte products that -# force enable MTE. -ifeq (,$(filter %_fullmte,$(TARGET_PRODUCT))) -PRODUCT_PRODUCT_PROPERTIES += ro.arm64.memtag.bootctl_supported=1 -PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.app.com.android.se=off -PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.app.com.google.android.bluetooth=off -PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.app.com.android.nfc=off -PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.system_server=off -endif diff --git a/device-ripcurrentpro.mk b/device-ripcurrentpro.mk index c0332e19..ee3becc2 100644 --- a/device-ripcurrentpro.mk +++ b/device-ripcurrentpro.mk @@ -242,17 +242,6 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \ hypervisor.memory_reclaim.supported=1 -# Indicate that the bootloader supports the MTE developer option switch -# (MISC_MEMTAG_MODE_MEMTAG_ONCE), with the exception of _fullmte products that -# force enable MTE. -ifeq (,$(filter %_fullmte,$(TARGET_PRODUCT))) -PRODUCT_PRODUCT_PROPERTIES += ro.arm64.memtag.bootctl_supported=1 -PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.app.com.android.se=off -PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.app.com.google.android.bluetooth=off -PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.app.com.android.nfc=off -PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.system_server=off -endif - # Thread HAL PRODUCT_PACKAGES += \ com.google.caimito.hardware.threadnetwork