From ff0cc4d3f416080b1f2a7bc6dea186805aa47022 Mon Sep 17 00:00:00 2001 From: Evgenii Stepanov Date: Wed, 3 Jan 2024 15:49:26 -0800 Subject: [PATCH 1/2] 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) Change-Id: Iee2b704c4ea39b5809193c1ceed3b8f41618dd40 --- device-common.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/device-common.mk b/device-common.mk index a97a76f4..c875b5a1 100644 --- a/device-common.mk +++ b/device-common.mk @@ -60,6 +60,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 From 94a943f67c7d8b9b2fe1a7d46d6a9531f8b30000 Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Wed, 3 Jan 2024 14:44:06 +0800 Subject: [PATCH 2/2] audio: check USE_AUDIO_HAL_AIDL instead of trunk flag Bug: 317745810 Test: manual test. (check audio_policy and hal version) Change-Id: Ie89aa296ca96ffaf4ee7b8d6299fb1a5cc431ef9 Signed-off-by: Jasmine Cha --- device.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/device.mk b/device.mk index 9c36b331..4123cf21 100644 --- a/device.mk +++ b/device.mk @@ -1027,11 +1027,11 @@ PRODUCT_PACKAGES += \ # Audio # Audio HAL Server & Default Implementations -#ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true) -#include device/google/gs-common/audio/aidl.mk -#else +ifeq ($(USE_AUDIO_HAL_AIDL),true) +include device/google/gs-common/audio/aidl.mk +else include device/google/gs-common/audio/hidl_zuma.mk -#endif +endif ## AoC soong PRODUCT_SOONG_NAMESPACES += \