Snap for 9428991 from c6e061bf63
to udc-release
Change-Id: Ic3e93425046e226745c16f5bca58179da30facce
This commit is contained in:
commit
10c299dcd5
4 changed files with 14 additions and 21 deletions
|
@ -36,6 +36,9 @@ include hardware/google/pixel/vibrator/cs40l25/device.mk
|
||||||
include device/google/gs-common/bcmbt/bluetooth.mk
|
include device/google/gs-common/bcmbt/bluetooth.mk
|
||||||
include device/google/gs-common/touch/stm/stm11.mk
|
include device/google/gs-common/touch/stm/stm11.mk
|
||||||
|
|
||||||
|
# wireless_charger HAL service
|
||||||
|
include device/google/gs-common/wireless_charger/wireless_charger.mk
|
||||||
|
|
||||||
ifeq ($(filter factory_oriole, $(TARGET_PRODUCT)),)
|
ifeq ($(filter factory_oriole, $(TARGET_PRODUCT)),)
|
||||||
include device/google/gs101/fingerprint/udfps_shipping.mk
|
include device/google/gs101/fingerprint/udfps_shipping.mk
|
||||||
else
|
else
|
||||||
|
@ -103,10 +106,6 @@ endif
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
device/google/raviole/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf
|
device/google/raviole/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf
|
||||||
|
|
||||||
|
|
||||||
# WirelessCharger
|
|
||||||
DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml
|
|
||||||
|
|
||||||
# MIPI Coex Configs
|
# MIPI Coex Configs
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
device/google/raviole/radio/oriole_display_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/display_primary_mipi_coex_table.csv \
|
device/google/raviole/radio/oriole_display_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/display_primary_mipi_coex_table.csv \
|
||||||
|
@ -258,10 +257,6 @@ PRODUCT_PACKAGES += \
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml
|
frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml
|
||||||
|
|
||||||
# Enable adpf cpu hint session for SurfaceFlinger
|
|
||||||
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
|
|
||||||
debug.sf.enable_adpf_cpu_hint=true
|
|
||||||
|
|
||||||
# Bluetooth OPUS codec
|
# Bluetooth OPUS codec
|
||||||
PRODUCT_PRODUCT_PROPERTIES += \
|
PRODUCT_PRODUCT_PROPERTIES += \
|
||||||
persist.bluetooth.opus.enabled=true
|
persist.bluetooth.opus.enabled=true
|
||||||
|
|
|
@ -35,6 +35,10 @@ include device/google/gs101/telephony/pktrouter.mk
|
||||||
include device/google/gs-common/bcmbt/bluetooth.mk
|
include device/google/gs-common/bcmbt/bluetooth.mk
|
||||||
include device/google/gs-common/touch/lsi/lsi.mk
|
include device/google/gs-common/touch/lsi/lsi.mk
|
||||||
|
|
||||||
|
# wireless_charger HAL service
|
||||||
|
include device/google/gs-common/wireless_charger/wireless_charger.mk
|
||||||
|
|
||||||
|
|
||||||
ifeq ($(filter factory_raven, $(TARGET_PRODUCT)),)
|
ifeq ($(filter factory_raven, $(TARGET_PRODUCT)),)
|
||||||
include device/google/gs101/fingerprint/udfps_shipping.mk
|
include device/google/gs101/fingerprint/udfps_shipping.mk
|
||||||
else
|
else
|
||||||
|
@ -110,9 +114,6 @@ PRODUCT_PRODUCT_PROPERTIES += \
|
||||||
persist.bluetooth.le_audio_test=false
|
persist.bluetooth.le_audio_test=false
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# WirelessCharger
|
|
||||||
DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml
|
|
||||||
|
|
||||||
# MIPI Coex Configs
|
# MIPI Coex Configs
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
device/google/raviole/radio/raven_camera_rear_tele_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/camera_rear_tele_mipi_coex_table.csv
|
device/google/raviole/radio/raven_camera_rear_tele_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/camera_rear_tele_mipi_coex_table.csv
|
||||||
|
@ -272,10 +273,6 @@ PRODUCT_PACKAGES += \
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml
|
frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml
|
||||||
|
|
||||||
# Enable adpf cpu hint session for SurfaceFlinger
|
|
||||||
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
|
|
||||||
debug.sf.enable_adpf_cpu_hint=true
|
|
||||||
|
|
||||||
# Display RRS default Config
|
# Display RRS default Config
|
||||||
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.vendor.display.primary.boot_config=1440x3120@120
|
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.vendor.display.primary.boot_config=1440x3120@120
|
||||||
|
|
||||||
|
|
|
@ -30,14 +30,14 @@ include hardware/google/pixel/vibrator/cs40l25/device.mk
|
||||||
include device/google/gs-common/bcmbt/bluetooth.mk
|
include device/google/gs-common/bcmbt/bluetooth.mk
|
||||||
include device/google/gs-common/touch/stm/stm11.mk
|
include device/google/gs-common/touch/stm/stm11.mk
|
||||||
|
|
||||||
|
# wireless_charger HAL service
|
||||||
|
include device/google/gs-common/wireless_charger/wireless_charger.mk
|
||||||
|
|
||||||
# go/lyric-soong-variables
|
# go/lyric-soong-variables
|
||||||
$(call soong_config_set,lyric,camera_hardware,slider)
|
$(call soong_config_set,lyric,camera_hardware,slider)
|
||||||
$(call soong_config_set,lyric,tuning_product,slider)
|
$(call soong_config_set,lyric,tuning_product,slider)
|
||||||
$(call soong_config_set,google3a_config,target_device,slider)
|
$(call soong_config_set,google3a_config,target_device,slider)
|
||||||
|
|
||||||
# WirelessCharger
|
|
||||||
DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml
|
|
||||||
|
|
||||||
# Init files
|
# Init files
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
device/google/raviole/conf/init.slider.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.slider.rc
|
device/google/raviole/conf/init.slider.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.slider.rc
|
||||||
|
|
|
@ -30,14 +30,15 @@ include device/google/raviole/audio/whitefin/audio-tables.mk
|
||||||
include device/google/gs-common/bcmbt/bluetooth.mk
|
include device/google/gs-common/bcmbt/bluetooth.mk
|
||||||
include device/google/gs-common/touch/lsi/lsi.mk
|
include device/google/gs-common/touch/lsi/lsi.mk
|
||||||
|
|
||||||
|
# wireless_charger HAL service needs to be included specially due to no raviole-sepolicy folder
|
||||||
|
PRODUCT_PACKAGES += vendor.google.wireless_charger-default
|
||||||
|
DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/wireless_charger/compatibility_matrix.xml
|
||||||
|
|
||||||
# go/lyric-soong-variables
|
# go/lyric-soong-variables
|
||||||
$(call soong_config_set,lyric,camera_hardware,slider)
|
$(call soong_config_set,lyric,camera_hardware,slider)
|
||||||
$(call soong_config_set,lyric,tuning_product,slider)
|
$(call soong_config_set,lyric,tuning_product,slider)
|
||||||
$(call soong_config_set,google3a_config,target_device,slider)
|
$(call soong_config_set,google3a_config,target_device,slider)
|
||||||
|
|
||||||
# WirelessCharger
|
|
||||||
DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml
|
|
||||||
|
|
||||||
# Init files
|
# Init files
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
device/google/raviole/conf/init.whitefin.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.whitefin.rc
|
device/google/raviole/conf/init.whitefin.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.whitefin.rc
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue