Merge "Revert "Disable MTE on certain system processes that have it enabled by default"" into main

This commit is contained in:
Mitch Phillips 2024-03-06 09:23:44 +00:00 committed by Android (Google) Code Review
commit 8a8bb96df8
2 changed files with 0 additions and 22 deletions

View file

@ -241,14 +241,3 @@ PRODUCT_VENDOR_PROPERTIES += \
# PKVM Memory Reclaim # PKVM Memory Reclaim
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
hypervisor.memory_reclaim.supported=1 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

View file

@ -242,17 +242,6 @@ PRODUCT_VENDOR_PROPERTIES += \
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
hypervisor.memory_reclaim.supported=1 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 # Thread HAL
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
com.google.caimito.hardware.threadnetwork com.google.caimito.hardware.threadnetwork