Merge "audio: use USE_AUDIO_HAL_AIDL instead flag variable" into main

This commit is contained in:
Treehugger Robot 2023-12-28 01:48:33 +00:00 committed by Android (Google) Code Review
commit be237dd43c
6 changed files with 6 additions and 6 deletions

View file

@ -17,7 +17,7 @@
AUDIO_TABLE_FOLDER := caiman
# Choose AIDL config by build flag.
ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true)
ifeq ($(USE_AUDIO_HAL_AIDL),true)
PRODUCT_SOONG_NAMESPACES += device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/aidl_config
PRODUCT_PACKAGES += audio_aidl_configs

View file

@ -17,7 +17,7 @@
AUDIO_TABLE_FOLDER := komodo
# Choose AIDL config by build flag.
ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true)
ifeq ($(USE_AUDIO_HAL_AIDL),true)
PRODUCT_SOONG_NAMESPACES += device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/aidl_config
PRODUCT_PACKAGES += audio_aidl_configs

View file

@ -17,7 +17,7 @@
AUDIO_TABLE_FOLDER := tokay
# Choose AIDL config by build flag.
ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true)
ifeq ($(USE_AUDIO_HAL_AIDL),true)
PRODUCT_SOONG_NAMESPACES += device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/aidl_config
PRODUCT_PACKAGES += audio_aidl_configs

View file

@ -33,8 +33,8 @@ $(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk)
# display
DEVICE_PACKAGE_OVERLAYS += device/google/caimito/caiman/overlay
include device/google/caimito/audio/caiman/audio-tables.mk
include device/google/zumapro/device-shipping-common.mk
include device/google/caimito/audio/caiman/audio-tables.mk
include hardware/google/pixel/vibrator/cs40l26/device.mk
include device/google/gs-common/bcmbt/bluetooth.mk
include device/google/gs-common/touch/gti/gti.mk

View file

@ -33,8 +33,8 @@ $(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk)
# display
DEVICE_PACKAGE_OVERLAYS += device/google/caimito/komodo/overlay
include device/google/caimito/audio/komodo/audio-tables.mk
include device/google/zumapro/device-shipping-common.mk
include device/google/caimito/audio/komodo/audio-tables.mk
include hardware/google/pixel/vibrator/cs40l26/device.mk
include device/google/gs-common/bcmbt/bluetooth.mk
include device/google/gs-common/touch/gti/gti.mk

View file

@ -26,8 +26,8 @@ $(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk)
# display
DEVICE_PACKAGE_OVERLAYS += device/google/caimito/tokay/overlay
include device/google/caimito/audio/tokay/audio-tables.mk
include device/google/zumapro/device-shipping-common.mk
include device/google/caimito/audio/tokay/audio-tables.mk
include hardware/google/pixel/vibrator/cs40l26/device.mk
include device/google/gs-common/bcmbt/bluetooth.mk
include device/google/gs-common/touch/gti/gti.mk