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

Snap for 11919022 from 6fdd64025b to mainline-tzdata6-release

Browse source 
Change-Id: I6fdf8a0131357b1143247be0f888c5d519b24e0b
This commit is contained in:
Android Build Coastguard Worker 2024-06-03 15:30:00 +00:00
commit daabad7a01
10 changed files with 62 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

2
OWNERS
View file

@ -1,4 +1,4 @@
per-file powerhint.json = jychen@google.com,jenhaochen@google.com,wvw@google.com,joaodias@google.com
# 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:/MK_OWNERS

8
audio/bluejay/config/audio_policy_configuration.xml
View file

@ -131,10 +131,6 @@
</devicePort>
<devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
</devicePort>
<devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
</devicePort>
<devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
</devicePort>
<devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
</devicePort>
<devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@ -145,8 +141,6 @@
</devicePort>
<devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
</devicePort>
<devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
</devicePort>
<devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
</devicePort>
<!-- Input devices declaration, i.e. Source DEVICE PORT -->
@ -154,8 +148,6 @@
</devicePort>
<devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
</devicePort>
<devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
</devicePort>
<devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
</devicePort>
<devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"

8
audio/bluejay/config/audio_policy_configuration_a2dp_offload_disabled.xml
View file

@ -131,10 +131,6 @@
</devicePort>
<devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
</devicePort>
<devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
</devicePort>
<devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
</devicePort>
<devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
</devicePort>
<devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@ -145,8 +141,6 @@
</devicePort>
<devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
</devicePort>
<devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
</devicePort>
<devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
</devicePort>
<!-- Input devices declaration, i.e. Source DEVICE PORT -->
@ -154,8 +148,6 @@
</devicePort>
<devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
</devicePort>
<devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
</devicePort>
<devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
</devicePort>
<devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source">

8
audio/bluejay/config/audio_policy_configuration_bluetooth_legacy_hal.xml
View file

@ -131,10 +131,6 @@
</devicePort>
<devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
</devicePort>
<devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
</devicePort>
<devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
</devicePort>
<devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
</devicePort>
<devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@ -145,8 +141,6 @@
</devicePort>
<devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
</devicePort>
<devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
</devicePort>
<devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
</devicePort>
<!-- Input devices declaration, i.e. Source DEVICE PORT -->
@ -154,8 +148,6 @@
</devicePort>
<devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
</devicePort>
<devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
</devicePort>
<devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
</devicePort>
<devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source">

3
audio/bluejay/tuning/waves/waves_config.ini
View file

@ -29,7 +29,6 @@ OST_SPEAKER = 0:12,90:13,180:12,270:0|13
SPEAKER_MUSIC = OM:1,SM:2,OST:OST_SPEAKER
SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER
SPEAKER_SAFE_CALL = OM:10,SM:2,OST:OST_SPEAKER
HEADSET_MUSIC = OM:2,SM:2
########################################################################################################
# This defines available CONTROL configurations. Only define the CONTROL if you need it.
@ -38,8 +37,6 @@ HEADSET_MUSIC = OM:2,SM:2
########################################################################################################
[HAL_SUPPORTED_CONTROLS]
SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_SAFE_CALL
A2DP_INSTANCE = INSTANCE:2,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC
USB_HEADPHONE_INSTANCE = INSTANCE:4,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC
[COEFS_CONVERTER_SETTING]
AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so

11
bluejay/BoardConfig.mk
View file

@ -21,18 +21,15 @@ else
endif
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_BLUEJAY_RADIO_DIR)
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
else
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
endif
RELEASE_GOOGLE_BOOTLOADER_BLUEJAY_DIR ?= pdk# Keep this for pdk TODO: b/327119000
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_BLUEJAY_DIR)
$(call soong_config_set,bluejay_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_BLUEJAY_DIR))
# Enable load module in parallel
BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
# The modules which need to be loaded in sequential
BOARD_KERNEL_CMDLINE += fips140.load_sequential=1
BOARD_KERNEL_CMDLINE += exynos_mfc.load_sequential=1
BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1

34
device-bluejay.mk
View file

@ -17,18 +17,10 @@
# Restrict the visibility of Android.bp files to improve build analysis time
$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
ifdef RELEASE_GOOGLE_BLUEJAY_KERNEL_VERSION
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_BLUEJAY_KERNEL_VERSION)
endif
ifdef RELEASE_GOOGLE_BLUEJAY_KERNEL_DIR
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_BLUEJAY_VERSION)
# Keeps flexibility for kasan and ufs builds
TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_BLUEJAY_KERNEL_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_BLUEJAY_KERNEL_DIR)/kernel-headers
else
TARGET_KERNEL_DIR ?= device/google/bluejay-kernel
TARGET_BOARD_KERNEL_HEADERS ?= device/google/bluejay-kernel/kernel-headers
endif
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_BLUEJAY_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_BLUEJAY_DIR)/kernel-headers
$(call inherit-product-if-exists, vendor/google_devices/bluejay/prebuilts/device-vendor-bluejay.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
@ -50,13 +42,6 @@ include device/google/gs-common/touch/stm/stm11.mk
# Fingerprint HAL
GOODIX_CONFIG_BUILD_VERSION := g7_trusty
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/firmware/fingerprint/24Q1
else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/firmware/fingerprint/24Q2
else
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/firmware/fingerprint/trunk
endif
$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk)
ifeq ($(filter factory%, $(TARGET_PRODUCT)),)
$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk)
@ -145,7 +130,7 @@ PRODUCT_SOONG_NAMESPACES += \
# Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.build.svn=60
ro.vendor.build.svn=62
# DCK properties based on target
PRODUCT_PROPERTY_OVERRIDES += \
@ -154,13 +139,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
# Trusty liboemcrypto.so
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/trusty/24Q1
else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/trusty/24Q2
else
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/bluejay/prebuilts/trusty/trunk
endif
# Display
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1
@ -252,6 +230,7 @@ endif
PRODUCT_SHIPPING_API_LEVEL := 32
# Vibrator HAL
$(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION)))
ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1
PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.vibrator.hal.supported_primitives=243 \
@ -285,3 +264,6 @@ PRODUCT_VENDOR_PROPERTIES += \
PRODUCT_PRODUCT_PROPERTIES += \
ro.quick_start.oem_id=00e0 \
ro.quick_start.device_id=bluejay
# Disable AVF Remote Attestation
PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true

2
gps.xml.b3
View file

@ -68,7 +68,7 @@
<gll
PpsEnable="true"
LogPriMask="LOG_INFO"
LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI | LOG_MEASAPI"
LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1"
MultiCarrLnaMask="L1_EXT_ON"

63
powerhint.json
View file

@ -1833,16 +1833,27 @@
"PID_Du": 0.0,
"UclampMin_On": true,
"UclampMin_Init": 232,
"UclampMin_LoadUp": 480,
"UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"UclampMax_EfficientBase": 400,
"UclampMax_EfficientOffset": 200,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
"ReportingRateLimitNs": 83333330,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 15.0
"StaleTimeFactor": 15.0,
"HeuristicBoost_On": true,
"HBoostOnMissedCycles": 8,
"HBoostOffMaxAvgRatio": 4.0,
"HBoostOffMissedCycles": 5,
"HBoostPidPuFactor": 0.5,
"HBoostUclampMin": 722,
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
},
{
"Name": "REFRESH_90FPS",
@ -1857,16 +1868,27 @@
"PID_Du": 0.0,
"UclampMin_On": true,
"UclampMin_Init": 162,
"UclampMin_LoadUp": 480,
"UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"UclampMax_EfficientBase": 400,
"UclampMax_EfficientOffset": 200,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
"ReportingRateLimitNs": 111111110,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 15.0
"StaleTimeFactor": 15.0,
"HeuristicBoost_On": true,
"HBoostOnMissedCycles": 8,
"HBoostOffMaxAvgRatio": 4.0,
"HBoostOffMissedCycles": 5,
"HBoostPidPuFactor": 0.5,
"HBoostUclampMin": 722,
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
},
{
"Name": "REFRESH_60FPS",
@ -1881,16 +1903,27 @@
"PID_Du": 0.0,
"UclampMin_On": true,
"UclampMin_Init": 162,
"UclampMin_LoadUp": 480,
"UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"UclampMax_EfficientBase": 400,
"UclampMax_EfficientOffset": 200,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
"ReportingRateLimitNs": 166666660,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 15.0
"StaleTimeFactor": 15.0,
"HeuristicBoost_On": true,
"HBoostOnMissedCycles": 8,
"HBoostOffMaxAvgRatio": 4.0,
"HBoostOffMissedCycles": 5,
"HBoostPidPuFactor": 0.5,
"HBoostUclampMin": 722,
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
},
{
"Name": "UiHighBoostWithoutPid",
@ -1910,9 +1943,9 @@
"UclampMin_Init": 250,
"UclampMin_High": 197,
"UclampMin_Low": 197,
"UclampMax_EfficientBase": 400,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0
},
@ -1934,9 +1967,9 @@
"UclampMin_Init": 250,
"UclampMin_High": 53,
"UclampMin_Low": 53,
"UclampMax_EfficientBase": 400,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0
},
@ -1958,9 +1991,9 @@
"UclampMin_Init": 250,
"UclampMin_High": 0,
"UclampMin_Low": 0,
"UclampMax_EfficientBase": 400,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0
}

100
thermal_info_config_bluejay.json
View file

@ -959,106 +959,6 @@
"Multiplier":1,
"Hidden":true
},
{
"Name":"soft_ocp_cpu2",
"Type":"BCL_CURRENT",
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
9000,
"NAN",
"NAN"
],
"HotHysteresis":[
0.0,
0.0,
0.0,
0.0,
100,
0.0,
0.0
],
"VrThreshold":"NAN",
"Multiplier":1,
"Hidden":true
},
{
"Name":"soft_ocp_cpu1",
"Type":"BCL_CURRENT",
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
7000,
"NAN",
"NAN"
],
"HotHysteresis":[
0.0,
0.0,
0.0,
0.0,
100,
0.0,
0.0
],
"VrThreshold":"NAN",
"Multiplier":1,
"Hidden":true
},
{
"Name":"soft_ocp_tpu",
"Type":"BCL_CURRENT",
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
8500,
"NAN",
"NAN"
],
"HotHysteresis":[
0.0,
0.0,
0.0,
0.0,
100,
0.0,
0.0
],
"VrThreshold":"NAN",
"Multiplier":1,
"Hidden":true
},
{
"Name":"soft_ocp_gpu",
"Type":"BCL_CURRENT",
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
9000,
"NAN",
"NAN"
],
"HotHysteresis":[
0.0,
0.0,
0.0,
0.0,
100,
0.0,
0.0
],
"VrThreshold":"NAN",
"Multiplier":1,
"Hidden":true
},
{
"Name":"TPU",
"Type":"NPU",