Evolution-X-Tensor/device_google_caimito
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "display: change device overlay order" into main

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

6
device-caiman.mk
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 # Disable modem until b/291009607 is fixed
BOARD_WITHOUT_RADIO := true 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/caimito/audio/caiman/audio-tables.mk
include device/google/zumapro/device-shipping-common.mk include device/google/zumapro/device-shipping-common.mk
include hardware/google/pixel/vibrator/cs40l26/device.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,lyric,tuning_product,caiman)
$(call soong_config_set,google3a_config,target_device,caiman) $(call soong_config_set,google3a_config,target_device,caiman)
# display
DEVICE_PACKAGE_OVERLAYS += device/google/caimito/caiman/overlay
# Init files # Init files
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/google/caimito/conf/init.caiman.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.caiman.rc device/google/caimito/conf/init.caiman.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.caiman.rc

5
device-komodo.mk
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 # Disable modem until b/291009607 is fixed
BOARD_WITHOUT_RADIO := true BOARD_WITHOUT_RADIO := true
# display
DEVICE_PACKAGE_OVERLAYS += device/google/caimito/komodo/overlay
include device/google/caimito/audio/komodo/audio-tables.mk include device/google/caimito/audio/komodo/audio-tables.mk
include device/google/zumapro/device-shipping-common.mk include device/google/zumapro/device-shipping-common.mk
include hardware/google/pixel/vibrator/cs40l26/device.mk include hardware/google/pixel/vibrator/cs40l26/device.mk
@ -45,8 +48,6 @@ $(call soong_config_set,lyric,camera_hardware,komodo)
$(call soong_config_set,lyric,tuning_product,komodo) $(call soong_config_set,lyric,tuning_product,komodo)
$(call soong_config_set,google3a_config,target_device,komodo) $(call soong_config_set,google3a_config,target_device,komodo)
# display
DEVICE_PACKAGE_OVERLAYS += device/google/caimito/komodo/overlay
# Display RRS default Config # Display RRS default Config
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.vendor.display.primary.boot_config=1008x2244@120 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.vendor.display.primary.boot_config=1008x2244@120
# TODO: b/250788756 - the property will be phased out after HWC loads user-preferred mode # TODO: b/250788756 - the property will be phased out after HWC loads user-preferred mode

6
device-tokay.mk
View file

@ -26,6 +26,9 @@ $(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk)
# Disable modem until b/291009607 is fixed # Disable modem until b/291009607 is fixed
BOARD_WITHOUT_RADIO := true BOARD_WITHOUT_RADIO := true
# display
DEVICE_PACKAGE_OVERLAYS += device/google/caimito/tokay/overlay
include device/google/caimito/audio/tokay/audio-tables.mk include device/google/caimito/audio/tokay/audio-tables.mk
include device/google/zumapro/device-shipping-common.mk include device/google/zumapro/device-shipping-common.mk
include hardware/google/pixel/vibrator/cs40l26/device.mk include hardware/google/pixel/vibrator/cs40l26/device.mk
@ -38,9 +41,6 @@ $(call soong_config_set,lyric,camera_hardware,tokay)
$(call soong_config_set,lyric,tuning_product,tokay) $(call soong_config_set,lyric,tuning_product,tokay)
$(call soong_config_set,google3a_config,target_device,tokay) $(call soong_config_set,google3a_config,target_device,tokay)
# display
DEVICE_PACKAGE_OVERLAYS += device/google/caimito/tokay/overlay
# display color data # display color data
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/google/caimito/tokay/panel_config_google-tk4b_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/panel_config_google-tk4b_cal0.pb device/google/caimito/tokay/panel_config_google-tk4b_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/panel_config_google-tk4b_cal0.pb