From 94a943f67c7d8b9b2fe1a7d46d6a9531f8b30000 Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Wed, 3 Jan 2024 14:44:06 +0800 Subject: [PATCH] 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 += \