comet: enable radio

And fix conflicts by ag/24621490

Bug: 296957189
Change-Id: Iccf29064cd07e8aa89f4254015699579b597c7ac
Signed-off-by: achigoliu <achigoliu@google.com>
This commit is contained in:
achigoliu 2023-08-22 11:18:01 +08:00 committed by Achigo Liu
parent b73a5a8474
commit 71041f1f05

View file

@ -26,11 +26,6 @@ $(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk)
DEVICE_PACKAGE_OVERLAYS += device/google/comet/comet/overlay DEVICE_PACKAGE_OVERLAYS += device/google/comet/comet/overlay
# Disable modem until b/291009607 is fixed
BOARD_WITHOUT_RADIO := true
DEVICE_PACKAGE_OVERLAYS += device/google/comet/comet/overlay
include device/google/zumapro/device-shipping-common.mk include device/google/zumapro/device-shipping-common.mk
include device/google/comet/audio/comet/audio-tables.mk include device/google/comet/audio/comet/audio-tables.mk
include hardware/google/pixel/vibrator/cs40l26/device.mk include hardware/google/pixel/vibrator/cs40l26/device.mk