From 0ded8d1e2ca9fb33d89c055f30dc8c1ced8f2a5f Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Tue, 2 Jan 2024 16:39:07 +0800 Subject: [PATCH 1/2] audio: check USE_AUDIO_HAL_AIDL instead of trunk flag Bug: 317745810 Test: manual test b/317745810#comment3 Change-Id: I223aaff717e4b84940640b1e5cff57decddaf111 Signed-off-by: Jasmine Cha --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 00fdc8b..a68200f 100644 --- a/device.mk +++ b/device.mk @@ -1009,7 +1009,7 @@ PRODUCT_PACKAGES += \ # Audio # Audio HAL Server & Default Implementations -ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true) +ifeq ($(USE_AUDIO_HAL_AIDL),true) include device/google/gs-common/audio/aidl.mk else include device/google/gs-common/audio/hidl_zuma.mk From a4a92ded54d2320151ac603892775ed223836bfc Mon Sep 17 00:00:00 2001 From: samou Date: Thu, 4 Jan 2024 04:02:38 +0000 Subject: [PATCH 2/2] bm: move to bcl-aidl Put build flag conditional inside bcl-aidl.mk to handle new battery mitigation service. Bug: 317869347 Change-Id: Ic2d781e5afbc1994fdf1a08528f4659fff929fed Signed-off-by: samou --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 00fdc8b..ff0d472 100644 --- a/device.mk +++ b/device.mk @@ -610,7 +610,7 @@ PRODUCT_PACKAGES += \ android.hardware.health.storage-service.default # Battery Mitigation -include device/google/gs-common/battery_mitigation/bcl.mk +include device/google/gs-common/battery_mitigation/bcl-aidl.mk # storage pixelstats -include hardware/google/pixel/pixelstats/device.mk