commit 29e115e63ed14d02caf3f86b29b1c50cd41f92c9
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Dec 28 01:48:33 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 28 01:48:33 2023 +0000
tree 9223baac0ba01d8937419aa52976ab0d60ab413f
parent 35e5021597de1a3b522d0e019de6baa7abce7c64
parent 1e19480c703afb8e31b61b5275a1872064e83975

Merge "audio: separate audio hal hidl/aidl by project" into main

audio/aidl.mk

diff --git a/audio/aidl.mk b/audio/aidl.mk
index 02a9649..5799541 100644
--- a/audio/aidl.mk
+++ b/audio/aidl.mk
@@ -1,3 +1,5 @@
+USE_AUDIO_HAL_AIDL := true
+
 DEVICE_MANIFEST_FILE += device/google/gs-common/audio/aidl/manifest.xml
 
 # Audio HALs

audio/common.mk

diff --git a/audio/common.mk b/audio/common.mk
index 4157970..edf7b6a 100644
--- a/audio/common.mk
+++ b/audio/common.mk
@@ -6,7 +6,7 @@
 	libmahalcontroller \
 	libAlgFx_HiFi3z
 
-ifneq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true)
+ifneq ($(USE_AUDIO_HAL_AIDL),true)
 ## AudioHAL Configurations
 PRODUCT_COPY_FILES += \
 	frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration_7_0.xml \