Snap for 11902131 from 35bc06e4c1 to 24Q3-release

Change-Id: I178099c2f0af75372c6942e4824d299992454cca
This commit is contained in:
Android Build Coastguard Worker 2024-05-29 23:01:59 +00:00
commit c5f6609870
4 changed files with 17 additions and 2 deletions

2
OWNERS
View file

@ -1,2 +1,4 @@
per-file perf/*,thermal/*= jenhaochen@google.com,wvw@google.com,joaodias@google.com,sayanna@google.com,liumartin@google.com,kamewang@google.com
# per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details. # per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details.
per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/OWNERS per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/OWNERS

View file

@ -24,7 +24,6 @@ RELEASE_GOOGLE_BOOTLOADER_COMET_DIR ?= 24D1# Keep this for pdk TODO: b/327119000
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_COMET_DIR) RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_COMET_DIR)
$(call soong_config_set,comet_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_COMET_DIR)) $(call soong_config_set,comet_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_COMET_DIR))
TARGET_LINUX_KERNEL_VERSION ?= 6.1 TARGET_LINUX_KERNEL_VERSION ?= 6.1
ifdef RELEASE_KERNEL_COMET_DIR ifdef RELEASE_KERNEL_COMET_DIR
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_COMET_DIR) TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_COMET_DIR)
@ -69,6 +68,10 @@ include device/google/gs-common/bcmbt/bluetooth.mk
include device/google/gs-common/touch/gti/predump_gti_dual.mk include device/google/gs-common/touch/gti/predump_gti_dual.mk
include device/google/gs-common/display/dump_second_display.mk include device/google/gs-common/display/dump_second_display.mk
# Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.build.svn=1
# go/lyric-soong-variables # go/lyric-soong-variables
$(call soong_config_set,lyric,camera_hardware,comet) $(call soong_config_set,lyric,camera_hardware,comet)
$(call soong_config_set,lyric,tuning_product,comet) $(call soong_config_set,lyric,tuning_product,comet)
@ -358,6 +361,10 @@ PRODUCT_VENDOR_PROPERTIES += \
persist.vendor.udfps.als_feed_forward_supported=true \ persist.vendor.udfps.als_feed_forward_supported=true \
persist.vendor.udfps.lhbm_controlled_in_hal_supported=true persist.vendor.udfps.lhbm_controlled_in_hal_supported=true
# Allow external binning setting
PRODUCT_VENDOR_PROPERTIES += \
persist.vendor.camera.allow_external_binning_setting=true
# Camera Vendor property # Camera Vendor property
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
persist.vendor.camera.front_720P_always_binning=true persist.vendor.camera.front_720P_always_binning=true
@ -475,3 +482,7 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
com.google.comet.hardware.threadnetwork com.google.comet.hardware.threadnetwork
endif endif
# Camera concurrent foldable dual front feature support
PRODUCT_PACKAGES += \
concurrent_foldable_dual_front_xml

View file

@ -70,6 +70,7 @@ IsUseEntireRespTime911=1
isForceHighAccuracyMode=1 isForceHighAccuracyMode=1
cp_partial_reset_disable=1 cp_partial_reset_disable=1
isUseUncalAccel=1 isUseUncalAccel=1
isUseUncalMagn=0
GNSS_CARRIER_CONFIG_BEGIN GNSS_CARRIER_CONFIG_BEGIN
GNSS_CARRIER_ID=0 GNSS_CARRIER_ID=0

View file

@ -208,8 +208,9 @@ isForceHighAccuracyMode=1
# 1 = CP partial reset feature disabled # 1 = CP partial reset feature disabled
cp_partial_reset_disable=1 cp_partial_reset_disable=1
# 0: Use calibrated Accel data 1: Use uncalibrated Accel data # 0: Use calibrated data 1: Use uncalibrated data
isUseUncalAccel=1 isUseUncalAccel=1
isUseUncalMagn=0
GNSS_CARRIER_CONFIG_BEGIN GNSS_CARRIER_CONFIG_BEGIN
# DEFAULT # DEFAULT