Snap for 8995964 from 2d842da3f6 to udc-release

Change-Id: I2a3286651727b69440e577ffb95e54e21490456d
This commit is contained in:
Android Build Coastguard Worker 2022-08-26 01:07:32 +00:00
commit 9b8b919923

View file

@ -30,7 +30,7 @@ include device/google/felix/audio/felix/audio-tables.mk
include device/google/gs201/device-shipping-common.mk include device/google/gs201/device-shipping-common.mk
$(call soong_config_set,fp_hal_feature,pixel_product, product_a) $(call soong_config_set,fp_hal_feature,pixel_product, product_a)
include hardware/google/pixel/vibrator/cs40l26/device-stereo.mk include hardware/google/pixel/vibrator/cs40l26/device-stereo.mk
include device/google/gs101/bluetooth/bluetooth.mk include device/google/gs-common/bcmbt/bluetooth.mk
ifeq ($(filter factory_felix, $(TARGET_PRODUCT)),) ifeq ($(filter factory_felix, $(TARGET_PRODUCT)),)
include device/google/felix/uwb/uwb_calibration.mk include device/google/felix/uwb/uwb_calibration.mk
endif endif
@ -120,7 +120,6 @@ DEVICE_MANIFEST_FILE += \
PRODUCT_SOONG_NAMESPACES += \ PRODUCT_SOONG_NAMESPACES += \
vendor/broadcom/bluetooth vendor/broadcom/bluetooth
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
android.hardware.bluetooth@1.1-service.bcmbtlinux \
bt_vendor.conf bt_vendor.conf
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/google/felix/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf device/google/felix/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf