Merge "display: change device overlay order" into main

This commit is contained in:
Jeremy DeHaan 2023-09-18 20:18:32 +00:00 committed by Android (Google) Code Review
commit 125c1dba94
3 changed files with 9 additions and 8 deletions

View file

@ -33,6 +33,9 @@ $(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk)
# Disable modem until b/291009607 is fixed
BOARD_WITHOUT_RADIO := true
# 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 hardware/google/pixel/vibrator/cs40l26/device.mk
@ -45,9 +48,6 @@ $(call soong_config_set,lyric,camera_hardware,caiman)
$(call soong_config_set,lyric,tuning_product,caiman)
$(call soong_config_set,google3a_config,target_device,caiman)
# display
DEVICE_PACKAGE_OVERLAYS += device/google/caimito/caiman/overlay
# Init files
PRODUCT_COPY_FILES += \
device/google/caimito/conf/init.caiman.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.caiman.rc