summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgenii Stepanov <eugenis@google.com>2024-01-03 15:49:26 -0800
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-01-05 21:03:12 +0000
commitb455f212b8a33140464bf38669c229ff0c7775da (patch)
tree65c976ff3ce970198e6f65b9bee779e34368e13d
parent91309215e8de56609c17c022ebac30e1d97718e0 (diff)
downloadzuma-b455f212b8a33140464bf38669c229ff0c7775da.tar.gz
Revert "Force disable MTE in Chrome in _fullmte build."
This reverts commit 4a1f9459e5a16ab777fc2af1f952554b71571757. The Chrome issue has been fixed upstread and this workaround is no longer needed; in fact, it triggers another issue where conflicting MTE mode settings make newer Chrome versions crash at startup. Bug: 297266100 Bug: 305005339 Bug: https://crbug.com/1515053 Test: chrome still does not crash; debuggerd shows MTE is enabled (grep for TCF_MTE) (cherry picked from https://android-review.googlesource.com/q/commit:ff0cc4d3f416080b1f2a7bc6dea186805aa47022) Merged-In: Iee2b704c4ea39b5809193c1ceed3b8f41618dd40 Change-Id: Iee2b704c4ea39b5809193c1ceed3b8f41618dd40
-rw-r--r--device-common.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/device-common.mk b/device-common.mk
index f197763..1998d96 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -63,6 +63,4 @@ 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
-else
-PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.app.com.android.chrome=off
endif