Snap for 11275524 from 6e610fe56f to 24Q2-release

Change-Id: I90983e68dd25098b2a968f555eabc39301a6d0f7
This commit is contained in:
Android Build Coastguard Worker 2024-01-05 00:03:42 +00:00
commit 1d184494f4

View file

@ -610,7 +610,7 @@ PRODUCT_PACKAGES += \
android.hardware.health.storage-service.default android.hardware.health.storage-service.default
# Battery Mitigation # Battery Mitigation
include device/google/gs-common/battery_mitigation/bcl.mk include device/google/gs-common/battery_mitigation/bcl-aidl.mk
# storage pixelstats # storage pixelstats
-include hardware/google/pixel/pixelstats/device.mk -include hardware/google/pixel/pixelstats/device.mk
@ -1009,7 +1009,7 @@ PRODUCT_PACKAGES += \
# Audio # Audio
# Audio HAL Server & Default Implementations # 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 include device/google/gs-common/audio/aidl.mk
else else
include device/google/gs-common/audio/hidl_zuma.mk include device/google/gs-common/audio/hidl_zuma.mk