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

Merge 24Q3 to AOSP main

Browse source 
Bug: 357762254
Merged-In: Ibec4f0c908089ca4304e59e9d37529fa2d4fa40d
Change-Id: Ib38789414cda136787b979c7f4b66929d96d1a97
This commit is contained in:
Xin Li 2024-09-05 17:02:38 -07:00
commit 5163ff95bd
52 changed files with 905 additions and 309 deletions
Download patch file Download diff file Expand all files Collapse all files

2
AndroidProducts.mk
View file

@ -19,12 +19,10 @@ PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/aosp_ripcurrent_fullmte.mk \
$(LOCAL_DIR)/factory_ripcurrent.mk \
$(LOCAL_DIR)/aosp_husky.mk \
$(LOCAL_DIR)/aosp_husky_61_pgagnostic.mk \
$(LOCAL_DIR)/aosp_husky_fullmte.mk \
$(LOCAL_DIR)/aosp_husky_pgagnostic.mk \
$(LOCAL_DIR)/factory_husky.mk \
$(LOCAL_DIR)/aosp_shiba.mk \
$(LOCAL_DIR)/aosp_shiba_61_pgagnostic.mk \
$(LOCAL_DIR)/aosp_shiba_fullmte.mk \
$(LOCAL_DIR)/aosp_shiba_pgagnostic.mk \
$(LOCAL_DIR)/factory_shiba.mk

33
BoardConfig-shusky-common.mk Normal file
View file

@ -0,0 +1,33 @@
#
# Copyright (C) 2024 The Android Open-Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
ifeq ($(PRODUCT_16K_DEVELOPER_OPTION),true)
# Configures the 16kb kernel and modules for OTA updates.
TARGET_KERNEL_DIR_16K := $(TARGET_KERNEL_DIR)/16kb
BOARD_KERNEL_PATH_16K := $(TARGET_KERNEL_DIR_16K)/Image.lz4
BOARD_KERNEL_MODULES_16K += $(file < $(TARGET_KERNEL_DIR_16K)/vendor_kernel_boot.modules.load)
BOARD_KERNEL_MODULES_16K += $(file < $(TARGET_KERNEL_DIR_16K)/system_dlkm.modules.load)
BOARD_KERNEL_MODULES_16K += $(file < $(TARGET_KERNEL_DIR_16K)/vendor_dlkm.modules.load)
BOARD_KERNEL_MODULES_16K := $(foreach module,$(BOARD_KERNEL_MODULES_16K),$(TARGET_KERNEL_DIR_16K)/$(notdir $(module)))
# Shusky targets use exynos-bcm_dbg.ko module instead of bcm_dbg.ko.
BOARD_KERNEL_MODULES_16K := $(filter-out %/bcm_dbg.ko,$(BOARD_KERNEL_MODULES_16K))
BOARD_KERNEL_MODULES_LOAD_16K := $(foreach module,$(BOARD_KERNEL_MODULES_16K),$(notdir $(module)))
BOARD_16K_OTA_USE_INCREMENTAL := true
BOARD_16K_OTA_MOVE_VENDOR := true
endif

2
aosp_husky.mk
View file

@ -20,7 +20,7 @@ USE_SWIFTSHADER := true
BOARD_USES_SWIFTSHADER := true
$(call inherit-product, device/google/zuma/aosp_common.mk)
$(call inherit-product, device/google/shusky/device-husky.mk)
$(call inherit-product, device/google/shusky/husky_generic.mk)
PRODUCT_NAME := aosp_husky
PRODUCT_DEVICE := husky

2
aosp_ripcurrent.mk
View file

@ -20,7 +20,7 @@ USE_SWIFTSHADER := true
BOARD_USES_SWIFTSHADER := true
$(call inherit-product, device/google/zuma/aosp_common.mk)
$(call inherit-product, device/google/shusky/device-ripcurrent.mk)
$(call inherit-product, device/google/shusky/ripcurrent_generic.mk)
PRODUCT_NAME := aosp_ripcurrent
PRODUCT_DEVICE := ripcurrent

2
aosp_shiba.mk
View file

@ -20,7 +20,7 @@ USE_SWIFTSHADER := true
BOARD_USES_SWIFTSHADER := true
$(call inherit-product, device/google/zuma/aosp_common.mk)
$(call inherit-product, device/google/shusky/device-shiba.mk)
$(call inherit-product, device/google/shusky/shiba_generic.mk)
PRODUCT_NAME := aosp_shiba
PRODUCT_DEVICE := shiba

10
audio/husky/aidl_config/mixer_paths_aidl.xml
View file

@ -1410,7 +1410,7 @@
<path name="bluetooth-sco-headset-microphones" />
</path>
<path name="usb-headset-microphones">
<path name="usb-microphones">
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
@ -1420,6 +1420,14 @@
<ctl name="MIC Record Soft Gain (dB)" value="0" />
</path>
<path name="usb-headset-microphones">
<path name="usb-microphones" />
</path>
<path name="usb-device-microphones">
<path name="usb-microphones" />
</path>
<!-- cs35l41 specific path to load firmware in cs35l41.c -->
<path name="cs35l41-load-protection-firmware-start">
<!-- Enable it after get the protection firmware -->

2
audio/husky/config/audio_platform_configuration.xml
View file

@ -308,7 +308,7 @@
<module libname="audio_waves_aoc.so" argu="Sink=SPK:1 ThermistorsName=VIRTUAL-SKIN-SPEAKER"/>
<module libname="audio_cca_aoc.so" argu="UnsupportBands=48000 ExSharedBands=48000 VoIPMode=Dl"/>
<module libname="audio_fortemedia_aoc.so" argu="MCPS_TABLE=y DL_CH=y VoIP_DLCHs=SPK:2,USB:2,BT:2 VoIP_Rate=32000 SHARED_MODULE=1130578253"/>
<module libname="audio_sounddose_aoc.so"/>
<module libname="audio_sounddose_aoc.so" argu="Blackbird,Condor=0,46.35,0.1950549451;54.6,57,0.98625"/>
<module libname="liboffloadeffect.so"/>
<module libname="audio_amcs_ext.so"/>
<module libname="audio_bluenote_aoc.so"/>

10
audio/husky/config/audio_policy_configuration.xml
View file

@ -51,8 +51,8 @@
samplingRates="8000 16000 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
<profile name="" format="AUDIO_FORMAT_OPUS"
samplingRates="8000 16000 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
samplingRates="48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="haptic" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@ -138,10 +138,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">
@ -161,8 +157,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"

10
audio/husky/config/audio_policy_configuration_a2dp_offload_disabled.xml
View file

@ -51,8 +51,8 @@
samplingRates="8000 16000 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
<profile name="" format="AUDIO_FORMAT_OPUS"
samplingRates="8000 16000 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
samplingRates="48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="haptic" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@ -138,10 +138,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">
@ -161,8 +157,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">

6
audio/husky/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">
@ -154,8 +150,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">

10
audio/husky/config/audio_policy_configuration_le_offload_disabled.xml
View file

@ -51,8 +51,8 @@
samplingRates="8000 16000 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
<profile name="" format="AUDIO_FORMAT_OPUS"
samplingRates="8000 16000 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
samplingRates="48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="haptic" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@ -138,10 +138,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">
@ -161,8 +157,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"

10
audio/shiba/aidl_config/mixer_paths_aidl.xml
View file

@ -1410,7 +1410,7 @@
<path name="bluetooth-sco-headset-microphones" />
</path>
<path name="usb-headset-microphones">
<path name="usb-microphones">
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
@ -1420,6 +1420,14 @@
<ctl name="MIC Record Soft Gain (dB)" value="0" />
</path>
<path name="usb-headset-microphones">
<path name="usb-microphones" />
</path>
<path name="usb-device-microphones">
<path name="usb-microphones" />
</path>
<!-- cs35l41 specific path to load firmware in cs35l41.c -->
<path name="cs35l41-load-protection-firmware-start">
<!-- Enable it after get the protection firmware -->

2
audio/shiba/config/audio_platform_configuration.xml
View file

@ -308,7 +308,7 @@
<module libname="audio_waves_aoc.so" argu="Sink=SPK:1 ThermistorsName=VIRTUAL-SKIN-SPEAKER"/>
<module libname="audio_cca_aoc.so" argu="UnsupportBands=48000 ExSharedBands=48000 VoIPMode=Dl"/>
<module libname="audio_fortemedia_aoc.so" argu="MCPS_TABLE=y DL_CH=y VoIP_DLCHs=SPK:2,USB:2,BT:2 VoIP_Rate=32000 SHARED_MODULE=1130578253"/>
<module libname="audio_sounddose_aoc.so"/>
<module libname="audio_sounddose_aoc.so" argu="Blackbird,Condor=0,46.35,0.1950549451;54.6,57,0.98625"/>
<module libname="liboffloadeffect.so"/>
<module libname="audio_amcs_ext.so"/>
<module libname="audio_bluenote_aoc.so"/>

10
audio/shiba/config/audio_policy_configuration.xml
View file

@ -51,8 +51,8 @@
samplingRates="8000 16000 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
<profile name="" format="AUDIO_FORMAT_OPUS"
samplingRates="8000 16000 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
samplingRates="48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="haptic" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@ -138,10 +138,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">
@ -161,8 +157,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"

10
audio/shiba/config/audio_policy_configuration_a2dp_offload_disabled.xml
View file

@ -51,8 +51,8 @@
samplingRates="8000 16000 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
<profile name="" format="AUDIO_FORMAT_OPUS"
samplingRates="8000 16000 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
samplingRates="48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="haptic" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@ -138,10 +138,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">
@ -161,8 +157,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">

6
audio/shiba/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">
@ -154,8 +150,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">

10
audio/shiba/config/audio_policy_configuration_le_offload_disabled.xml
View file

@ -51,8 +51,8 @@
samplingRates="8000 16000 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
<profile name="" format="AUDIO_FORMAT_OPUS"
samplingRates="8000 16000 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
samplingRates="48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="haptic" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@ -138,10 +138,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">
@ -161,8 +157,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"

13
bluetooth/bt_vendor_overlay.conf
View file

@ -14,6 +14,19 @@ HwStageDoesNotCtrlPowerPinFromAoc = PROTO1.0-EVT1.0-EVT1.2
# supported by BT firmware.
HwStageWithOldChipFwNoLongerSupport = PROTO1.0-PROTO1.1
# Priority of uart type
# HciUartSocket = 0
# SerialUartPort = 1
# SerialAocUartPort = 2
# UserialInvalid = 3
UserialTypePriority = 2-1
# <string> The hardware support which offload capability
BtOffloadCap = AOC
# <string> The BT Offload Trunk Flag Group Name
BtOffloadTrunkGroup = 23P_AOC
# <boolean> APM Uart skip suspend to aovid hold system too long when BT using AOC UART
ApmUartSkipSuspend = true

13
bluetooth/bt_vendor_overlay_ripcurrent.conf
View file

@ -3,6 +3,19 @@
# Uart port name
UartPort = /dev/ttySAC18
# Priority of uart type
# HciUartSocket = 0
# SerialUartPort = 1
# SerialAocUartPort = 2
# UserialInvalid = 3
UserialTypePriority = 2-1
# <string> The hardware support which offload capability
BtOffloadCap = AOC
# <string> The BT Offload Trunk Flag Group Name
BtOffloadTrunkGroup = 23P_AOC
# Sar backOff high resolution support
SarBackOffHighResolution = true

2
bluetooth/le_audio_codec_capabilities.xml
View file

@ -52,7 +52,6 @@
<scenario encode="TwoChanStereo_32_2" decode="OneChanMono_32_2"/>
<scenario encode="OneChanMono_32_2" decode="OneChanMono_32_2"/>
<!-- broadcast -->
<scenario encode="invalid" decode="invalid" broadcast="BcastStereo_48_4"/>
<scenario encode="invalid" decode="invalid" broadcast="BcastStereo_48_2"/>
<scenario encode="invalid" decode="invalid" broadcast="BcastStereo_24_2"/>
<scenario encode="invalid" decode="invalid" broadcast="BcastStereo_16_2"/>
@ -76,7 +75,6 @@
<configuration name="OneChanMono_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="MONO_ONE_CIS_PER_DEVICE"/>
<configuration name="TwoChanStereo_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="STEREO_TWO_CISES_PER_DEVICE"/>
<configuration name="OneChanStereo_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="STEREO_ONE_CIS_PER_DEVICE"/>
<configuration name="BcastStereo_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="BROADCAST_STEREO"/>
<configuration name="BcastStereo_48_2" codecConfiguration="LC3_48k_2" strategyConfiguration="BROADCAST_STEREO"/>
<configuration name="BcastStereo_24_2" codecConfiguration="LC3_24k_2" strategyConfiguration="BROADCAST_STEREO"/>
<configuration name="BcastStereo_16_2" codecConfiguration="LC3_16k_2" strategyConfiguration="BROADCAST_STEREO"/>

69
device-husky.mk
View file

@ -17,17 +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)
TARGET_KERNEL_DIR ?= device/google/shusky-kernel
TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers
ifdef RELEASE_GOOGLE_HUSKY_KERNEL_VERSION
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_HUSKY_KERNEL_VERSION)
endif
ifdef RELEASE_GOOGLE_HUSKY_KERNEL_DIR
TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_HUSKY_KERNEL_DIR)
TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_HUSKY_KERNEL_DIR)/kernel-headers
endif
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_HUSKY_VERSION)
# Keeps flexibility for kasan and ufs builds
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_HUSKY_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_HUSKY_DIR)/kernel-headers
LOCAL_PATH := device/google/shusky
@ -38,13 +31,22 @@ ifeq ($(filter factory_husky, $(TARGET_PRODUCT)),)
include device/google/shusky/uwb/uwb_calibration.mk
endif
DEVICE_PAGE_AGNOSTIC ?= $(if $(filter %_pgagnostic,$(TARGET_PRODUCT)),true,false)
ifeq ($(DEVICE_PAGE_AGNOSTIC),true)
TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
TARGET_KERNEL_DIR := $(RELEASE_KERNEL_HUSKY_DIR)/16kb
TARGET_RW_FILE_SYSTEM_TYPE := ext4
else
PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_HUSKY_16K_DEVELOPER_OPTION)
endif
$(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-husky.mk)
$(call inherit-product-if-exists, vendor/google_devices/zuma/prebuilts/device-vendor.mk)
$(call inherit-product-if-exists, vendor/google_devices/zuma/proprietary/device-vendor.mk)
$(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/husky/device-vendor-husky.mk)
$(call inherit-product-if-exists, vendor/google_devices/husky/proprietary/device-vendor.mk)
$(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal-r63/Device.mk)
$(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk)
$(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/WallpapersHusky.mk)
# display
@ -118,6 +120,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
persist.bluetooth.a2dp_offload.disabled=false \
persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus
# Enable Bluetooth AutoOn feature
PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.server.automatic_turn_on=true
# Bluetooth Tx power caps
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/bluetooth/bluetooth_power_limits_husky.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \
@ -235,6 +241,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.leaudio.dual_bidirection_swb.supported=true
# Support LE & Classic concurrent encryption (b/330704060)
PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.ble.allow_enc_with_bredr=true
# Support One-Handed mode
PRODUCT_PRODUCT_PROPERTIES += \
ro.support_one_handed_mode=true
@ -282,13 +292,6 @@ PRODUCT_PACKAGES += \
# Trusty liboemcrypto.so
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1
else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q2
else
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk
endif
# UWB
PRODUCT_SOONG_NAMESPACES += \
@ -319,14 +322,8 @@ PRODUCT_VENDOR_PROPERTIES += \
persist.device_config.configuration.disable_rescue_party=true
# Fingerprint HAL
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q1
else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q2
else
APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/trunk
endif
GOODIX_CONFIG_BUILD_VERSION := g7_trusty
APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts
$(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)
@ -367,9 +364,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1
# blocking zone for min idle refresh rate
PRODUCT_VENDOR_PROPERTIES += \
vendor.primarydisplay.min_idle_refresh_rate.default=1 \
vendor.primarydisplay.min_idle_refresh_rate.blocking_zone=10 \
vendor.primarydisplay.min_idle_refresh_rate.blocking_zone_dbv=492
ro.vendor.primarydisplay.blocking_zone.min_refresh_rate_by_nits=15:10,:1
# Display ACL
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.0.brightness.acl.default=0
@ -379,6 +374,7 @@ PRODUCT_COPY_FILES += \
device/google/shusky/husky/panel_config_google-hk3_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/panel_config_google-hk3_cal0.pb
# Vibrator HAL
$(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION)))
ACTUATOR_MODEL := luxshare_ict_081545
ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1
PRODUCT_VENDOR_PROPERTIES += \
@ -399,8 +395,15 @@ PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.vibrator.hal.pm.activetimeout=5
# Increment the SVN for any official public releases
ifdef RELEASE_SVN_HUSKY
TARGET_SVN ?= $(RELEASE_SVN_HUSKY)
else
# Set this for older releases that don't use build flag
TARGET_SVN ?= 35
endif
PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.build.svn=26
ro.vendor.build.svn=$(TARGET_SVN)
# WLC userdebug specific
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
@ -470,4 +473,10 @@ PRODUCT_PACKAGES += \
NoCutoutOverlay \
AvoidAppsInCutoutOverlay
# ETM
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
endif
PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true

26
device-ripcurrent.mk
View file

@ -17,17 +17,9 @@
# Restrict the visibility of Android.bp files to improve build analysis time
$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
TARGET_KERNEL_DIR ?= device/google/shusky-kernel
TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers
ifdef RELEASE_GOOGLE_RIPCURRENT_KERNEL_VERSION
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_RIPCURRENT_KERNEL_VERSION)
endif
ifdef RELEASE_GOOGLE_RIPCURRENT_KERNEL_DIR
TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_RIPCURRENT_KERNEL_DIR)
TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_RIPCURRENT_KERNEL_DIR)/kernel-headers
endif
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_RIPCURRENT_VERSION)
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_RIPCURRENT_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_RIPCURRENT_DIR)/kernel-headers
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
USE_UWBFIELDTESTQM := true
@ -191,6 +183,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.leaudio.dual_bidirection_swb.supported=true
# Support LE & Classic concurrent encryption (b/330704060)
PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.ble.allow_enc_with_bredr=true
# Keymaster HAL
#LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service
@ -231,13 +227,6 @@ PRODUCT_PACKAGES += \
# Trusty liboemcrypto.so
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1
else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q2
else
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk
endif
# UWB
PRODUCT_SOONG_NAMESPACES += \
@ -276,6 +265,7 @@ PRODUCT_VENDOR_PROPERTIES += \
persist.vendor.camera.front_720P_always_binning=true
# Vibrator HAL
$(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION)))
ACTUATOR_MODEL := luxshare_ict_081545
PRODUCT_VENDOR_PROPERTIES += \
persist.vendor.vibrator.hal.chirp.enabled=0 \

64
device-shiba.mk
View file

@ -17,20 +17,23 @@
# Restrict the visibility of Android.bp files to improve build analysis time
$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
TARGET_KERNEL_DIR ?= device/google/shusky-kernel
TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers
ifdef RELEASE_GOOGLE_SHIBA_KERNEL_VERSION
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_SHIBA_KERNEL_VERSION)
endif
ifdef RELEASE_GOOGLE_SHIBA_KERNEL_DIR
TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_SHIBA_KERNEL_DIR)
TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_SHIBA_KERNEL_DIR)/kernel-headers
endif
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_SHIBA_VERSION)
# Keeps flexibility for kasan and ufs builds
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_SHIBA_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_SHIBA_DIR)/kernel-headers
LOCAL_PATH := device/google/shusky
DEVICE_PAGE_AGNOSTIC ?= $(if $(filter %_pgagnostic,$(TARGET_PRODUCT)),true,false)
ifeq ($(DEVICE_PAGE_AGNOSTIC),true)
TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
TARGET_KERNEL_DIR := $(RELEASE_KERNEL_SHIBA_DIR)/16kb
TARGET_RW_FILE_SYSTEM_TYPE := ext4
else
PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_SHIBA_16K_DEVELOPER_OPTION)
endif
$(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-shiba.mk)
$(call inherit-product-if-exists, vendor/google_devices/zuma/prebuilts/device-vendor.mk)
$(call inherit-product-if-exists, vendor/google_devices/zuma/proprietary/device-vendor.mk)
@ -102,6 +105,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
persist.bluetooth.a2dp_offload.disabled=false \
persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus
# Enable Bluetooth AutoOn feature
PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.server.automatic_turn_on=true
# Bluetooth Tx power caps
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/bluetooth/bluetooth_power_limits_shiba.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \
@ -222,6 +229,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.leaudio.dual_bidirection_swb.supported=true
# Support LE & Classic concurrent encryption (b/330704060)
PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.ble.allow_enc_with_bredr=true
# Support One-Handed mode
PRODUCT_PRODUCT_PROPERTIES += \
ro.support_one_handed_mode=true
@ -268,13 +279,6 @@ PRODUCT_PACKAGES += \
# Trusty liboemcrypto.so
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1
else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q2
else
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk
endif
# Location
# SDK build system
@ -301,14 +305,8 @@ PRODUCT_VENDOR_PROPERTIES += \
persist.device_config.configuration.disable_rescue_party=true
# Fingerprint HAL
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q1
else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q2
else
APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/trunk
endif
GOODIX_CONFIG_BUILD_VERSION := g7_trusty
APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts
$(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)
@ -353,6 +351,7 @@ PRODUCT_PRODUCT_PROPERTIES += ro.odm.build.media_performance_class=34
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1
# Vibrator HAL
$(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION)))
ACTUATOR_MODEL := luxshare_ict_081545
ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1
PRODUCT_VENDOR_PROPERTIES += \
@ -373,8 +372,15 @@ PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.vibrator.hal.pm.activetimeout=5
# Increment the SVN for any official public releases
ifdef RELEASE_SVN_SHIBA
TARGET_SVN ?= $(RELEASE_SVN_SHIBA)
else
# Set this for older releases that don't use build flag
TARGET_SVN ?= 35
endif
PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.build.svn=26
ro.vendor.build.svn=$(TARGET_SVN)
# P23 Devices no longer need rlsservice
PRODUCT_VENDOR_PROPERTIES += \
@ -436,4 +442,10 @@ PRODUCT_PACKAGES += \
NoCutoutOverlay \
AvoidAppsInCutoutOverlay
# ETM
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
endif
PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true

3
factory_husky.mk
View file

@ -35,3 +35,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
# Factory binaries of camera
PRODUCT_PACKAGES += fatp_hk3sb3_wide_hat_tool fatp_hk3_tele_hat_tool fatp_hk3_ultrawide_hat_tool fatp_hk3_front_hat_tool factory_hk3sb3_main_cam_decompress_test
# preloaded_nanoapps.json
PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory

3
factory_ripcurrent.mk
View file

@ -35,3 +35,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
# Factory binaries of camera
PRODUCT_PACKAGES += fatp_hk3sb3_wide_hat_tool fatp_hk3_tele_hat_tool fatp_hk3_ultrawide_hat_tool fatp_sb3_ultrawide_hat_tool fatp_hk3_front_hat_tool factory_hk3sb3_main_cam_decompress_test
# preloaded_nanoapps.json
PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory

3
factory_shiba.mk
View file

@ -35,3 +35,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
# Factory binaries of camera
PRODUCT_PACKAGES += fatp_hk3sb3_wide_hat_tool fatp_sb3_ultrawide_hat_tool factory_hk3sb3_main_cam_decompress_test sb3_ultrawide_af_fw_update
# preloaded_nanoapps.json
PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory

22
husky/BoardConfig.mk
View file

@ -18,6 +18,7 @@
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_drm.load_sequential=1
BOARD_KERNEL_CMDLINE += g2d.load_sequential=1
BOARD_KERNEL_CMDLINE += samsung_iommu_v9.load_sequential=1
@ -27,14 +28,9 @@ TARGET_BOOTLOADER_BOARD_NAME := husky
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_HUSKY_RADIO_DIR)
RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_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_HUSKY_DIR ?= pdk# Keep this for pdk TODO: b/327119000
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR)
$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR))
ifdef PHONE_CAR_BOARD_PRODUCT
include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
@ -51,6 +47,7 @@ BOARD_KERNEL_CMDLINE += disable_dma32=on
WIFI_FEATURE_REAR_CAMERA_SAR := true
$(call soong_config_set,wifi,feature_rear_camera_sar,$(WIFI_FEATURE_REAR_CAMERA_SAR))
include device/google/shusky/BoardConfig-shusky-common.mk
include device/google/shusky/device-shusky-common.mk
include device/google/zuma/BoardConfig-common.mk
@ -59,11 +56,6 @@ include device/google/zuma/BoardConfig-common.mk
include device/google/shusky-sepolicy/husky-sepolicy.mk
include device/google/shusky/wifi/BoardConfig-wifi.mk
# Android Virtualization Framework (AVF) team is using husky with hypervisor in
# nvhe mode as a development platform to build infrastructure that supports
# assigning devices to guest VMs.
#
# TODO(b/278008514): remove this once we have builds from our kernel branch.
ifeq ($(HUSKY_ENABLE_DEVICE_ASSIGNMENT), true)
BOARD_KERNEL_CMDLINE += kvm-arm.mode=nvhe
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-include device/google/common/etm/5_15/BoardUserdebugModules.mk
endif

20
husky_generic.mk Normal file
View file

@ -0,0 +1,20 @@
#
# Copyright 2024 The Android Open-Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
$(call inherit-product, device/google/shusky/device-husky.mk)
# preloaded_nanoapps.json
PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p23_common

4
location/gps.xml
View file

@ -35,7 +35,7 @@
SuplVersion="2"
SuplMinorVersion="0"
SuplOtdoaCapable="true"
SuplOtdoaCapable2="false"
SuplOtdoaCapable2="true"
SuplGlonassCapable = "true"
SuplGalileoCapable = "true"
SuplBdsCapable = "true"
@ -68,7 +68,7 @@
<gll
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_L5"
MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"

4
location/gps.xml.hk3
View file

@ -35,7 +35,7 @@
SuplVersion="2"
SuplMinorVersion="0"
SuplOtdoaCapable="true"
SuplOtdoaCapable2="false"
SuplOtdoaCapable2="true"
SuplGlonassCapable = "true"
SuplGalileoCapable = "true"
SuplBdsCapable = "true"
@ -68,7 +68,7 @@
<gll
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_L5"
MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"

4
location/gps.xml.sb3
View file

@ -35,7 +35,7 @@
SuplVersion="2"
SuplMinorVersion="0"
SuplOtdoaCapable="true"
SuplOtdoaCapable2="false"
SuplOtdoaCapable2="true"
SuplGlonassCapable = "true"
SuplGalileoCapable = "true"
SuplBdsCapable = "true"
@ -68,7 +68,7 @@
<gll
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_L5"
MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"

2
location/gps_user.xml
View file

@ -34,7 +34,7 @@
SuplVersion="2"
SuplMinorVersion="0"
SuplOtdoaCapable="true"
SuplOtdoaCapable2="false"
SuplOtdoaCapable2="true"
SuplGlonassCapable = "true"
SuplGalileoCapable = "true"
SuplBdsCapable = "true"

2
location/gps_user.xml.hk3
View file

@ -34,7 +34,7 @@
SuplVersion="2"
SuplMinorVersion="0"
SuplOtdoaCapable="true"
SuplOtdoaCapable2="false"
SuplOtdoaCapable2="true"
SuplGlonassCapable = "true"
SuplGalileoCapable = "true"
SuplBdsCapable = "true"

2
location/gps_user.xml.sb3
View file

@ -34,7 +34,7 @@
SuplVersion="2"
SuplMinorVersion="0"
SuplOtdoaCapable="true"
SuplOtdoaCapable2="false"
SuplOtdoaCapable2="true"
SuplGlonassCapable = "true"
SuplGalileoCapable = "true"
SuplBdsCapable = "true"

220
perf/powerhint-husky.json
View file

@ -221,6 +221,16 @@
],
"ResetOnInit": true
},
{
"Name": "AutoPreferIdle",
"Path": "/proc/vendor_sched/auto_prefer_idle",
"Values": [
"0",
"1"
],
"DefaultIndex": 0,
"ResetOnInit": true
},
{
"Name": "BigClusterPowerDownTargetResidency",
"Path": "/sys/devices/platform/cpupm/cpupm/cpd_cl2_target_residency",
@ -420,6 +430,33 @@
"DefaultIndex": 0,
"ResetOnInit": true
},
{
"Name": "TAPreferredIdleMaskHigh",
"Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_high",
"Values": [
"0x1ff",
"0xff"
],
"ResetOnInit": true
},
{
"Name": "TAPreferredIdleMaskMid",
"Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_mid",
"Values": [
"0x1ff",
"0xff"
],
"ResetOnInit": true
},
{
"Name": "TAPreferredIdleMaskLow",
"Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_low",
"Values": [
"0x1ff",
"0xff"
],
"ResetOnInit": true
},
{
"Name": "FGPreferIdle",
"Path": "/proc/vendor_sched/groups/fg/prefer_idle",
@ -681,7 +718,7 @@
"Values": [
"50",
"30",
"20",
"23",
"18"
],
"DefaultIndex": 0
@ -805,12 +842,30 @@
"Duration": 1000,
"Value": "0-3"
},
{
"PowerHint": "LAUNCH",
"Node": "TAPreferredIdleMaskHigh",
"Duration": 5000,
"Value": "0x1ff"
},
{
"PowerHint": "LAUNCH",
"Node": "TAPreferredIdleMaskMid",
"Duration": 5000,
"Value": "0x1ff"
},
{
"PowerHint": "LAUNCH",
"Node": "ReducePreferIdle",
"Duration": 5000,
"Value": "0"
},
{
"PowerHint": "LAUNCH",
"Node": "AutoPreferIdle",
"Duration": 5000,
"Value": "0"
},
{
"PowerHint": "LAUNCH_GPU",
"Node": "GPUDvfsPeriod",
@ -1018,6 +1073,12 @@
"Duration": 2000,
"Value": "1"
},
{
"PowerHint": "LAUNCH_EXTEND",
"Node": "AutoPreferIdle",
"Duration": 2000,
"Value": "0"
},
{
"PowerHint": "LAUNCH_PMU",
"Node": "PMU_POLL",
@ -1030,6 +1091,12 @@
"Duration": 5000,
"Value": "0"
},
{
"PowerHint": "DISPLAY_CHANGE",
"Node": "AutoPreferIdle",
"Duration": 5000,
"Value": "0"
},
{
"PowerHint": "DISPLAY_CHANGE_GPU",
"Node": "GPUDvfsPeriod",
@ -1196,6 +1263,12 @@
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "DISPLAY_INACTIVE",
"Node": "AutoPreferIdle",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "DISPLAY_INACTIVE",
"Node": "FGPreferIdle",
@ -1286,6 +1359,12 @@
"Duration": 1000,
"Value": "1"
},
{
"PowerHint": "CAMERA_LAUNCH",
"Node": "AutoPreferIdle",
"Duration": 1000,
"Value": "0"
},
{
"PowerHint": "CAMERA_LAUNCH",
"Node": "FGCpuset",
@ -1406,6 +1485,12 @@
"Duration": 100,
"Value": "1"
},
{
"PowerHint": "CAMERA_ZOOMING_BOOST",
"Node": "AutoPreferIdle",
"Duration": 100,
"Value": "0"
},
{
"PowerHint": "CAMERA_ZOOMING_BOOST",
"Node": "PMU_POLL",
@ -1718,6 +1803,12 @@
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "AutoPreferIdle",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "CDHighCpusetCpus",
@ -1800,7 +1891,7 @@
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PMU_MID_SPC_THRESHOLD",
"Duration": 0,
"Value": "20"
"Value": "23"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
@ -1880,6 +1971,12 @@
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "AutoPreferIdle",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CDHighCpusetCpus",
@ -1910,6 +2007,12 @@
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "AutoPreferIdle",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPUDVFSHeadroom",
@ -2054,6 +2157,12 @@
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "AutoPreferIdle",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CPUDVFSHeadroom",
@ -2168,6 +2277,12 @@
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "AutoPreferIdle",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "CDPreferIdle",
@ -2589,6 +2704,12 @@
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "GAME",
"Node": "AutoPreferIdle",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "GAME",
"Node": "FGPreferIdle",
@ -2712,25 +2833,19 @@
{
"PowerHint": "FACE_UNLOCK_BOOST",
"Node": "CPUBigClusterMaxFreq",
"Duration": 1000,
"Duration": 500,
"Value": "9999999"
},
{
"PowerHint": "FACE_UNLOCK_BOOST",
"Node": "CPU_LITTLE_TSKIN_BYPASS",
"Duration": 1000,
"Value": "1"
},
{
"PowerHint": "FACE_UNLOCK_BOOST",
"Node": "CPU_MID_TSKIN_BYPASS",
"Duration": 1000,
"Value": "1"
"Node": "CPUBigClusterMinFreq",
"Duration": 500,
"Value": "1852000"
},
{
"PowerHint": "FACE_UNLOCK_BOOST",
"Node": "CPU_BIG_TSKIN_BYPASS",
"Duration": 1000,
"Duration": 500,
"Value": "1"
},
{
@ -2926,6 +3041,7 @@
"Value": "20 80"
}
],
"GpuSysfsPath" : "/sys/devices/platform/1f000000.mali",
"AdpfConfig": [
{
"Name": "REFRESH_120FPS",
@ -2940,16 +3056,29 @@
"PID_Du": 0.0,
"UclampMin_On": true,
"UclampMin_Init": 231,
"UclampMin_LoadUp": 480,
"UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"UclampMax_EfficientBase": 500,
"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,
"GpuBoost": true,
"GpuCapacityBoostMax": 40000,
"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",
@ -2964,16 +3093,29 @@
"PID_Du": 0.0,
"UclampMin_On": true,
"UclampMin_Init": 231,
"UclampMin_LoadUp": 480,
"UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"UclampMax_EfficientBase": 500,
"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,
"GpuBoost": true,
"GpuCapacityBoostMax": 32500,
"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",
@ -2988,16 +3130,29 @@
"PID_Du": 0.0,
"UclampMin_On": true,
"UclampMin_Init": 231,
"UclampMin_LoadUp": 480,
"UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"UclampMax_EfficientBase": 500,
"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,
"GpuBoost": true,
"GpuCapacityBoostMax": 25000,
"HeuristicBoost_On": true,
"HBoostOnMissedCycles": 8,
"HBoostOffMaxAvgRatio": 4.0,
"HBoostOffMissedCycles": 5,
"HBoostPidPuFactor": 0.5,
"HBoostUclampMin": 722,
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
},
{
"Name": "UiHighBoostWithoutPid",
@ -3017,11 +3172,12 @@
"UclampMin_Init": 250,
"UclampMin_High": 196,
"UclampMin_Low": 196,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0
"StaleTimeFactor": 5.0,
"GpuBoost": false
},
{
"Name": "UiLowBoostWithoutPid",
@ -3041,11 +3197,12 @@
"UclampMin_Init": 250,
"UclampMin_High": 52,
"UclampMin_Low": 52,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0
"StaleTimeFactor": 5.0,
"GpuBoost": false
},
{
"Name": "UiLowNoneBoost",
@ -3065,11 +3222,12 @@
"UclampMin_Init": 250,
"UclampMin_High": 0,
"UclampMin_Low": 0,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0
"StaleTimeFactor": 5.0,
"GpuBoost": false
}
]
}

208
perf/powerhint-ripcurrent.json
View file

@ -207,6 +207,16 @@
],
"ResetOnInit": true
},
{
"Name": "AutoPreferIdle",
"Path": "/proc/vendor_sched/auto_prefer_idle",
"Values": [
"0",
"1"
],
"DefaultIndex": 0,
"ResetOnInit": true
},
{
"Name": "BigClusterPowerDownTargetResidency",
"Path": "/sys/devices/platform/cpupm/cpupm/cpd_cl2_target_residency",
@ -406,6 +416,33 @@
"DefaultIndex": 0,
"ResetOnInit": true
},
{
"Name": "TAPreferredIdleMaskHigh",
"Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_high",
"Values": [
"0x1ff",
"0xff"
],
"ResetOnInit": true
},
{
"Name": "TAPreferredIdleMaskMid",
"Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_mid",
"Values": [
"0x1ff",
"0xff"
],
"ResetOnInit": true
},
{
"Name": "TAPreferredIdleMaskLow",
"Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_low",
"Values": [
"0x1ff",
"0xff"
],
"ResetOnInit": true
},
{
"Name": "FGPreferIdle",
"Path": "/proc/vendor_sched/groups/fg/prefer_idle",
@ -727,7 +764,7 @@
"Values": [
"50",
"30",
"20",
"23",
"18"
],
"DefaultIndex": 0
@ -827,12 +864,30 @@
"Duration": 1000,
"Value": "0-3"
},
{
"PowerHint": "LAUNCH",
"Node": "TAPreferredIdleMaskHigh",
"Duration": 5000,
"Value": "0x1ff"
},
{
"PowerHint": "LAUNCH",
"Node": "TAPreferredIdleMaskMid",
"Duration": 5000,
"Value": "0x1ff"
},
{
"PowerHint": "LAUNCH",
"Node": "ReducePreferIdle",
"Duration": 5000,
"Value": "0"
},
{
"PowerHint": "LAUNCH",
"Node": "AutoPreferIdle",
"Duration": 5000,
"Value": "0"
},
{
"PowerHint": "LAUNCH_GPU",
"Node": "GPUDvfsPeriod",
@ -1040,6 +1095,12 @@
"Duration": 2000,
"Value": "1"
},
{
"PowerHint": "LAUNCH_EXTEND",
"Node": "AutoPreferIdle",
"Duration": 2000,
"Value": "0"
},
{
"PowerHint": "LAUNCH_PMU",
"Node": "PMU_POLL",
@ -1052,6 +1113,12 @@
"Duration": 5000,
"Value": "0"
},
{
"PowerHint": "DISPLAY_CHANGE",
"Node": "AutoPreferIdle",
"Duration": 5000,
"Value": "0"
},
{
"PowerHint": "DISPLAY_CHANGE_GPU",
"Node": "GPUDvfsPeriod",
@ -1195,6 +1262,12 @@
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "DISPLAY_INACTIVE",
"Node": "AutoPreferIdle",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "DISPLAY_INACTIVE",
"Node": "FGPreferIdle",
@ -1267,6 +1340,12 @@
"Duration": 1000,
"Value": "1"
},
{
"PowerHint": "CAMERA_LAUNCH",
"Node": "AutoPreferIdle",
"Duration": 1000,
"Value": "0"
},
{
"PowerHint": "CAMERA_LAUNCH",
"Node": "FGCpuset",
@ -1369,6 +1448,12 @@
"Duration": 100,
"Value": "1"
},
{
"PowerHint": "CAMERA_ZOOMING_BOOST",
"Node": "AutoPreferIdle",
"Duration": 100,
"Value": "0"
},
{
"PowerHint": "CAMERA_ZOOMING_BOOST",
"Node": "PMU_POLL",
@ -1579,6 +1664,12 @@
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "AutoPreferIdle",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "CDHighCpusetCpus",
@ -1649,7 +1740,7 @@
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PMU_MID_SPC_THRESHOLD",
"Duration": 0,
"Value": "20"
"Value": "23"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
@ -1729,6 +1820,12 @@
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "AutoPreferIdle",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CDHighCpusetCpus",
@ -1747,6 +1844,12 @@
"Duration": 0,
"Value": "4-8"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "AutoPreferIdle",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PowerHALCameraRunning",
@ -1873,6 +1976,12 @@
"Duration": 0,
"Value": "4-8"
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "AutoPreferIdle",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "PowerHALCameraRunning",
@ -1981,6 +2090,12 @@
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "AutoPreferIdle",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "CDPreferIdle",
@ -2336,6 +2451,12 @@
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "GAME",
"Node": "AutoPreferIdle",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "GAME",
"Node": "FGPreferIdle",
@ -2501,25 +2622,19 @@
{
"PowerHint": "FACE_UNLOCK_BOOST",
"Node": "CPUBigClusterMaxFreq",
"Duration": 1000,
"Duration": 500,
"Value": "9999999"
},
{
"PowerHint": "FACE_UNLOCK_BOOST",
"Node": "CPU_LITTLE_TSKIN_BYPASS",
"Duration": 1000,
"Value": "1"
},
{
"PowerHint": "FACE_UNLOCK_BOOST",
"Node": "CPU_MID_TSKIN_BYPASS",
"Duration": 1000,
"Value": "1"
"Node": "CPUBigClusterMinFreq",
"Duration": 500,
"Value": "1852000"
},
{
"PowerHint": "FACE_UNLOCK_BOOST",
"Node": "CPU_BIG_TSKIN_BYPASS",
"Duration": 1000,
"Duration": 500,
"Value": "1"
},
{
@ -2723,16 +2838,27 @@
"PID_Du": 0.0,
"UclampMin_On": true,
"UclampMin_Init": 231,
"UclampMin_LoadUp": 480,
"UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"UclampMax_EfficientBase": 500,
"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",
@ -2746,17 +2872,28 @@
"PID_Do": 500.0,
"PID_Du": 0.0,
"UclampMin_On": true,
"UclampMin_Init": 161,
"UclampMin_Init": 231,
"UclampMin_LoadUp": 480,
"UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"UclampMax_EfficientBase": 500,
"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",
@ -2770,17 +2907,28 @@
"PID_Do": 500.0,
"PID_Du": 0.0,
"UclampMin_On": true,
"UclampMin_Init": 161,
"UclampMin_Init": 231,
"UclampMin_LoadUp": 480,
"UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"UclampMax_EfficientBase": 500,
"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",
@ -2800,9 +2948,9 @@
"UclampMin_Init": 250,
"UclampMin_High": 196,
"UclampMin_Low": 196,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0
},
@ -2824,9 +2972,9 @@
"UclampMin_Init": 250,
"UclampMin_High": 52,
"UclampMin_Low": 52,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0
},
@ -2848,9 +2996,9 @@
"UclampMin_Init": 250,
"UclampMin_High": 0,
"UclampMin_Low": 0,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0
}

220
perf/powerhint-shiba.json
View file

@ -211,6 +211,16 @@
],
"ResetOnInit": true
},
{
"Name": "AutoPreferIdle",
"Path": "/proc/vendor_sched/auto_prefer_idle",
"Values": [
"0",
"1"
],
"DefaultIndex": 0,
"ResetOnInit": true
},
{
"Name": "BigClusterPowerDownTargetResidency",
"Path": "/sys/devices/platform/cpupm/cpupm/cpd_cl2_target_residency",
@ -420,6 +430,33 @@
"DefaultIndex": 0,
"ResetOnInit": true
},
{
"Name": "TAPreferredIdleMaskHigh",
"Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_high",
"Values": [
"0x1ff",
"0xff"
],
"ResetOnInit": true
},
{
"Name": "TAPreferredIdleMaskMid",
"Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_mid",
"Values": [
"0x1ff",
"0xff"
],
"ResetOnInit": true
},
{
"Name": "TAPreferredIdleMaskLow",
"Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_low",
"Values": [
"0x1ff",
"0xff"
],
"ResetOnInit": true
},
{
"Name": "FGPreferIdle",
"Path": "/proc/vendor_sched/groups/fg/prefer_idle",
@ -681,7 +718,7 @@
"Values": [
"50",
"30",
"20",
"23",
"18"
],
"DefaultIndex": 0
@ -805,12 +842,30 @@
"Duration": 1000,
"Value": "0-3"
},
{
"PowerHint": "LAUNCH",
"Node": "TAPreferredIdleMaskHigh",
"Duration": 5000,
"Value": "0x1ff"
},
{
"PowerHint": "LAUNCH",
"Node": "TAPreferredIdleMaskMid",
"Duration": 5000,
"Value": "0x1ff"
},
{
"PowerHint": "LAUNCH",
"Node": "ReducePreferIdle",
"Duration": 5000,
"Value": "0"
},
{
"PowerHint": "LAUNCH",
"Node": "AutoPreferIdle",
"Duration": 5000,
"Value": "0"
},
{
"PowerHint": "LAUNCH_GPU",
"Node": "GPUDvfsPeriod",
@ -1018,6 +1073,12 @@
"Duration": 2000,
"Value": "1"
},
{
"PowerHint": "LAUNCH_EXTEND",
"Node": "AutoPreferIdle",
"Duration": 2000,
"Value": "0"
},
{
"PowerHint": "LAUNCH_PMU",
"Node": "PMU_POLL",
@ -1030,6 +1091,12 @@
"Duration": 5000,
"Value": "0"
},
{
"PowerHint": "DISPLAY_CHANGE",
"Node": "AutoPreferIdle",
"Duration": 5000,
"Value": "0"
},
{
"PowerHint": "DISPLAY_CHANGE_GPU",
"Node": "GPUDvfsPeriod",
@ -1125,6 +1192,12 @@
"Duration": 5000,
"Value": "1"
},
{
"PowerHint": "DISPLAY_INACTIVE",
"Node": "AutoPreferIdle",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "DISPLAY_CHANGE",
"Node": "FGPreferIdle",
@ -1292,6 +1365,12 @@
"Duration": 1000,
"Value": "1"
},
{
"PowerHint": "CAMERA_LAUNCH",
"Node": "AutoPreferIdle",
"Duration": 1000,
"Value": "0"
},
{
"PowerHint": "CAMERA_LAUNCH",
"Node": "FGCpuset",
@ -1412,6 +1491,12 @@
"Duration": 100,
"Value": "1"
},
{
"PowerHint": "CAMERA_ZOOMING_BOOST",
"Node": "AutoPreferIdle",
"Duration": 100,
"Value": "0"
},
{
"PowerHint": "CAMERA_ZOOMING_BOOST",
"Node": "PMU_POLL",
@ -1622,6 +1707,12 @@
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "AutoPreferIdle",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_EXTREME",
"Node": "CDHighCpusetCpus",
@ -1704,7 +1795,7 @@
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PMU_MID_SPC_THRESHOLD",
"Duration": 0,
"Value": "20"
"Value": "23"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
@ -1778,6 +1869,12 @@
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "AutoPreferIdle",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CDPreferIdle",
@ -1814,6 +1911,12 @@
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "AutoPreferIdle",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPUDVFSHeadroom",
@ -1958,6 +2061,12 @@
"Duration": 0,
"Value": "camera"
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "AutoPreferIdle",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CPUDVFSHeadroom",
@ -2072,6 +2181,12 @@
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "AutoPreferIdle",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "CDPreferIdle",
@ -2481,6 +2596,12 @@
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "GAME",
"Node": "AutoPreferIdle",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "GAME",
"Node": "FGPreferIdle",
@ -2616,25 +2737,19 @@
{
"PowerHint": "FACE_UNLOCK_BOOST",
"Node": "CPUBigClusterMaxFreq",
"Duration": 1000,
"Duration": 500,
"Value": "9999999"
},
{
"PowerHint": "FACE_UNLOCK_BOOST",
"Node": "CPU_LITTLE_TSKIN_BYPASS",
"Duration": 1000,
"Value": "1"
},
{
"PowerHint": "FACE_UNLOCK_BOOST",
"Node": "CPU_MID_TSKIN_BYPASS",
"Duration": 1000,
"Value": "1"
"Node": "CPUBigClusterMinFreq",
"Duration": 500,
"Value": "1852000"
},
{
"PowerHint": "FACE_UNLOCK_BOOST",
"Node": "CPU_BIG_TSKIN_BYPASS",
"Duration": 1000,
"Duration": 500,
"Value": "1"
},
{
@ -2830,6 +2945,7 @@
"Value": "20 80"
}
],
"GpuSysfsPath" : "/sys/devices/platform/1f000000.mali",
"AdpfConfig": [
{
"Name": "REFRESH_120FPS",
@ -2844,16 +2960,29 @@
"PID_Du": 0.0,
"UclampMin_On": true,
"UclampMin_Init": 231,
"UclampMin_LoadUp": 480,
"UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"UclampMax_EfficientBase": 500,
"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,
"GpuBoost": true,
"GpuCapacityBoostMax": 150000,
"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",
@ -2868,16 +2997,29 @@
"PID_Du": 0.0,
"UclampMin_On": true,
"UclampMin_Init": 231,
"UclampMin_LoadUp": 480,
"UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"UclampMax_EfficientBase": 500,
"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,
"GpuBoost": true,
"GpuCapacityBoostMax": 125000,
"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",
@ -2892,16 +3034,29 @@
"PID_Du": 0.0,
"UclampMin_On": true,
"UclampMin_Init": 231,
"UclampMin_LoadUp": 480,
"UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"UclampMax_EfficientBase": 500,
"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,
"GpuBoost": true,
"GpuCapacityBoostMax": 100000,
"HeuristicBoost_On": true,
"HBoostOnMissedCycles": 8,
"HBoostOffMaxAvgRatio": 4.0,
"HBoostOffMissedCycles": 5,
"HBoostPidPuFactor": 0.5,
"HBoostUclampMin": 722,
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
},
{
"Name": "UiHighBoostWithoutPid",
@ -2921,11 +3076,12 @@
"UclampMin_Init": 250,
"UclampMin_High": 196,
"UclampMin_Low": 196,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0
"StaleTimeFactor": 5.0,
"GpuBoost": false
},
{
"Name": "UiLowBoostWithoutPid",
@ -2945,11 +3101,12 @@
"UclampMin_Init": 250,
"UclampMin_High": 52,
"UclampMin_Low": 52,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0
"StaleTimeFactor": 5.0,
"GpuBoost": false
},
{
"Name": "UiLowNoneBoost",
@ -2969,11 +3126,12 @@
"UclampMin_Init": 250,
"UclampMin_High": 0,
"UclampMin_Low": 0,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0
"StaleTimeFactor": 5.0,
"GpuBoost": false
}
]
}

10
ripcurrent/BoardConfig.mk
View file

@ -27,13 +27,9 @@ TARGET_SCREEN_DENSITY := 440
BOARD_USES_GENERIC_AUDIO := true
USES_DEVICE_GOOGLE_SHUSKY := true
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_RIPCURRENT_DIR ?= pdk# Keep this for pdk TODO: b/327119000
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR)
$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR))
include device/google/shusky/device-shusky-common.mk

20
ripcurrent_generic.mk Normal file
View file

@ -0,0 +1,20 @@
#
# Copyright 2024 The Android Open-Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
$(call inherit-product, device/google/shusky/device-ripcurrent.mk)
# preloaded_nanoapps.json
PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p23_common

8
rro_overlays/WifiOverlay/res/values/config.xml
View file

@ -152,7 +152,7 @@
<!-- Boolean indicating whether we should enable the STA current connected indoor channel
for SAP, WFD GO, Wi-Fi Aware -->
<bool translatable="false" name="config_wifiEnableStaIndoorChannelForPeerNetwork">true</bool>
<bool translatable="false" name="config_wifiEnableStaIndoorChannelForPeerNetwork">false</bool>
<!-- Boolean indicating whether we should enable the STA current connected DFS channel
for SAP, WFD GO, Wi-Fi Aware -->
<bool translatable="false" name="config_wifiEnableStaDfsChannelForPeerNetwork">true</bool>
@ -181,4 +181,10 @@
If equals to 0, it means there's no limit on the max number of channels to include per network.-->
<integer translatable="false" name="config_wifiInitialPartialScanMaxNewChannelsPerNetwork">3</integer>
<!-- Boolean indicating whether to disable firmware roaming when the device goes into idle mode.
true: firmware roaming will be disabled when the device goes into idle mode, and then
re-activated when the device exits idle mode.
false: firmware roaming will not be affected. -->
<bool translatable="false" name ="config_wifiDisableFirmwareRoamingInIdleMode">true</bool>
</resources>

16
shiba/BoardConfig.mk
View file

@ -18,6 +18,7 @@
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_drm.load_sequential=1
BOARD_KERNEL_CMDLINE += g2d.load_sequential=1
BOARD_KERNEL_CMDLINE += samsung_iommu_v9.load_sequential=1
@ -27,13 +28,9 @@ TARGET_BOOTLOADER_BOARD_NAME := shiba
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_SHIBA_RADIO_DIR)
RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_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_SHIBA_DIR ?= pdk# Keep this for pdk TODO: b/327119000
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR)
$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR))
ifdef PHONE_CAR_BOARD_PRODUCT
include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
@ -46,6 +43,7 @@ USES_DEVICE_GOOGLE_SHUSKY := true
BOARD_KERNEL_CMDLINE += swiotlb=noforce
BOARD_KERNEL_CMDLINE += disable_dma32=on
include device/google/shusky/BoardConfig-shusky-common.mk
include device/google/shusky/device-shusky-common.mk
include device/google/zuma/BoardConfig-common.mk
@ -53,3 +51,7 @@ include device/google/zuma/BoardConfig-common.mk
-include vendor/google_devices/shiba/proprietary/BoardConfigVendor.mk
include device/google/shusky-sepolicy/shiba-sepolicy.mk
include device/google/shusky/wifi/BoardConfig-wifi.mk
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-include device/google/common/etm/5_15/BoardUserdebugModules.mk
endif

6
shiba/rro_overlays/NfcOverlay/res/values/config.xml
View file

@ -16,11 +16,6 @@
<resources>
<bool name="nfcc_always_on_allowed">false</bool>
<bool name="polling_disable_allowed">true</bool>
<string-array name="config_skuSupportsSecureNfc" translatable="false">
<item>GKWS6</item>
<item>GZPF0</item>
<item>GPJ41</item>
</string-array>
<bool name="tag_intent_app_pref_supported">true</bool>
<!-- NFC Antenna Location API -->
<integer name="device_width">68</integer>
@ -33,4 +28,5 @@
<item>97</item>
</integer-array>
<bool name="nfc_observe_mode_supported">true</bool>
<bool name="enable_secure_nfc_support">true</bool>
</resources>

20
shiba_generic.mk Normal file
View file

@ -0,0 +1,20 @@
#
# Copyright 2024 The Android Open-Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
$(call inherit-product, device/google/shusky/device-shiba.mk)
# preloaded_nanoapps.json
PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p23_common

22
thermal/thermal_info_config_husky.json
View file

@ -327,10 +327,6 @@
"PollingDelay":300000,
"PassiveDelay":7000,
"BindedCdevInfo": [
{
"CdevRequest": "tpu_cooling",
"LimitInfo": [0, 2, 3, 4, 5, 5, 5]
},
{
"CdevRequest": "gxp-cooling",
"LimitInfo": [0, 0, 0, 0, 0, 6, 6]
@ -603,7 +599,7 @@
]
},
{
"Name":"VIRTUAL-SKIN-CPU-GPU",
"Name":"VIRTUAL-SKIN-SOC",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
@ -623,7 +619,7 @@
"K_D":["NaN", "NaN", "NaN", 0, "NaN", "NaN", "NaN"],
"I_Max":["NaN", "NaN", "NaN", 2600, "NaN", "NaN", "NaN"],
"S_Power":["NaN", "NaN", "NaN", 800, "NaN", "NaN", "NaN"],
"MinAllocPower":["NaN", "NaN", "NaN", 0, "NaN", "NaN", "NaN"],
"MinAllocPower":["NaN", "NaN", "NaN", 800, "NaN", "NaN", "NaN"],
"MaxAllocPower":["NaN", "NaN", "NaN", 3900, "NaN", "NaN", "NaN"],
"I_Cutoff":["NaN", "NaN", "NaN", 8, "NaN", "NaN", "NaN"]
},
@ -663,6 +659,15 @@
"BindedPowerRail": "S2S_VDD_G3D",
"CdevCeiling": [0, 8, 8, 8, 9, 11, 11],
"LimitInfo": [0, 0, 0, 0, 0, 11, 11]
},
{
"CdevRequest": "tpu_cooling",
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"BindedPowerRail": "S7M_VDD_TPU",
"CdevCeiling": [0, 7, 7, 7, 7, 7, 7],
"LimitInfo": [0, 0, 0, 0, 0, 7, 7]
}
]
},
@ -1138,6 +1143,11 @@
"PowerSampleDelay":7000,
"PowerSampleCount":1
},
{
"Name":"S7M_VDD_TPU",
"PowerSampleDelay":7000,
"PowerSampleCount":1
},
{
"Name":"PARTIAL_SYSTEM_POWER",
"VirtualRails":true,

22
thermal/thermal_info_config_shiba.json
View file

@ -295,10 +295,6 @@
"PollingDelay":300000,
"PassiveDelay":7000,
"BindedCdevInfo": [
{
"CdevRequest": "tpu_cooling",
"LimitInfo": [0, 2, 3, 4, 5, 5, 5]
},
{
"CdevRequest": "gxp-cooling",
"LimitInfo": [0, 0, 0, 0, 0, 6, 6]
@ -571,7 +567,7 @@
]
},
{
"Name":"VIRTUAL-SKIN-CPU-GPU",
"Name":"VIRTUAL-SKIN-SOC",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
@ -591,7 +587,7 @@
"K_D":["NaN", "NaN", "NaN", 0, "NaN", "NaN", "NaN"],
"I_Max":["NaN", "NaN", "NaN", 2600, "NaN", "NaN", "NaN"],
"S_Power":["NaN", "NaN", "NaN", 800, "NaN", "NaN", "NaN"],
"MinAllocPower":["NaN", "NaN", "NaN", 0, "NaN", "NaN", "NaN"],
"MinAllocPower":["NaN", "NaN", "NaN", 800, "NaN", "NaN", "NaN"],
"MaxAllocPower":["NaN", "NaN", "NaN", 3900, "NaN", "NaN", "NaN"],
"I_Cutoff":["NaN", "NaN", "NaN", 8, "NaN", "NaN", "NaN"]
},
@ -631,6 +627,15 @@
"BindedPowerRail": "S2S_VDD_G3D",
"CdevCeiling": [0, 9, 9, 9, 9, 11, 11],
"LimitInfo": [0, 0, 0, 0, 0, 11, 11]
},
{
"CdevRequest": "tpu_cooling",
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
"BindedPowerRail": "S7M_VDD_TPU",
"CdevCeiling": [0, 7, 7, 7, 7, 7, 7],
"LimitInfo": [0, 0, 0, 0, 0, 7, 7]
}
]
},
@ -1171,6 +1176,11 @@
"PowerSampleDelay":7000,
"PowerSampleCount":1
},
{
"Name":"S7M_VDD_TPU",
"PowerSampleDelay":7000,
"PowerSampleCount":1
},
{
"Name":"PARTIAL_SYSTEM_POWER",
"VirtualRails":true,

6
uwb/calibration-CE.conf
View file

@ -17,7 +17,7 @@ ant0.ch5.ref_frame3.tx_power_index=33:33:33:33
ant0.ch5.ref_frame4.tx_power_index=37:37:37:37
ant0.ch5.ref_frame5.tx_power_index=37:37:37:37
ant0.ch5.ref_frame6.tx_power_index=32:32:32:32
ant0.ch5.ref_frame7.tx_power_index=FF:FF:FF:FF
ant0.ch5.ref_frame7.tx_power_index=FE:FE:FE:FE
# pp cw tx pwr
ant0.ch5.ref_frame0.post_tx_power_index=0xff
@ -66,7 +66,7 @@ ant0.ch9.ref_frame3.tx_power_index=36:36:36:36
ant0.ch9.ref_frame4.tx_power_index=32:32:32:32
ant0.ch9.ref_frame5.tx_power_index=31:31:31:31
ant0.ch9.ref_frame6.tx_power_index=37:37:37:37
ant0.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF
ant0.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE
# pp cw tx pwr
ant0.ch9.ref_frame0.post_tx_power_index=0xff
@ -115,7 +115,7 @@ ant1.ch9.ref_frame3.tx_power_index=37:37:37:37
ant1.ch9.ref_frame4.tx_power_index=40:40:40:40
ant1.ch9.ref_frame5.tx_power_index=3B:3B:3B:3B
ant1.ch9.ref_frame6.tx_power_index=39:39:39:39
ant1.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF
ant1.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE
# pp cw tx pwr
ant1.ch9.ref_frame0.post_tx_power_index=0xff

6
uwb/calibration-FCC.conf
View file

@ -17,7 +17,7 @@ ant0.ch5.ref_frame3.tx_power_index=33:33:33:33
ant0.ch5.ref_frame4.tx_power_index=3E:3E:3E:3E
ant0.ch5.ref_frame5.tx_power_index=3B:3B:3B:3B
ant0.ch5.ref_frame6.tx_power_index=32:32:32:32
ant0.ch5.ref_frame7.tx_power_index=FF:FF:FF:FF
ant0.ch5.ref_frame7.tx_power_index=FE:FE:FE:FE
# pp cw tx pwr
ant0.ch5.ref_frame0.post_tx_power_index=0x34
@ -66,7 +66,7 @@ ant0.ch9.ref_frame3.tx_power_index=3B:3B:3B:3B
ant0.ch9.ref_frame4.tx_power_index=3E:3E:3E:3E
ant0.ch9.ref_frame5.tx_power_index=37:37:37:37
ant0.ch9.ref_frame6.tx_power_index=39:39:39:39
ant0.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF
ant0.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE
# pp cw tx pwr
ant0.ch9.ref_frame0.post_tx_power_index=0x32
@ -115,7 +115,7 @@ ant1.ch9.ref_frame3.tx_power_index=3A:3A:3A:3A
ant1.ch9.ref_frame4.tx_power_index=40:40:40:40
ant1.ch9.ref_frame5.tx_power_index=3E:3E:3E:3E
ant1.ch9.ref_frame6.tx_power_index=34:34:34:34
ant1.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF
ant1.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE
# pp cw tx pwr
ant1.ch9.ref_frame0.post_tx_power_index=0x32

4
uwb/calibration-JP.conf
View file

@ -16,7 +16,7 @@ ant0.ch9.ref_frame3.tx_power_index=32:32:32:32
ant0.ch9.ref_frame4.tx_power_index=41:41:41:41
ant0.ch9.ref_frame5.tx_power_index=40:40:40:40
ant0.ch9.ref_frame6.tx_power_index=35:35:35:35
ant0.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF
ant0.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE
# pp cw tx pwr
ant0.ch9.ref_frame0.post_tx_power_index=0xff
@ -65,7 +65,7 @@ ant1.ch9.ref_frame3.tx_power_index=34:34:34:34
ant1.ch9.ref_frame4.tx_power_index=3C:3C:3C:3C
ant1.ch9.ref_frame5.tx_power_index=3B:3B:3B:3B
ant1.ch9.ref_frame6.tx_power_index=30:30:30:30
ant1.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF
ant1.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE
# pp cw tx pwr
ant1.ch9.ref_frame0.post_tx_power_index=0xff

6
uwb/calibration-TW.conf
View file

@ -17,7 +17,7 @@ ant0.ch5.ref_frame3.tx_power_index=33:33:33:33
ant0.ch5.ref_frame4.tx_power_index=3E:3E:3E:3E
ant0.ch5.ref_frame5.tx_power_index=3B:3B:3B:3B
ant0.ch5.ref_frame6.tx_power_index=32:32:32:32
ant0.ch5.ref_frame7.tx_power_index=FF:FF:FF:FF
ant0.ch5.ref_frame7.tx_power_index=FE:FE:FE:FE
# pp cw tx pwr
ant0.ch5.ref_frame0.post_tx_power_index=0x34
@ -66,7 +66,7 @@ ant0.ch9.ref_frame3.tx_power_index=3B:3B:3B:3B
ant0.ch9.ref_frame4.tx_power_index=3E:3E:3E:3E
ant0.ch9.ref_frame5.tx_power_index=37:37:37:37
ant0.ch9.ref_frame6.tx_power_index=39:39:39:39
ant0.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF
ant0.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE
# pp cw tx pwr
ant0.ch9.ref_frame0.post_tx_power_index=0x32
@ -115,7 +115,7 @@ ant1.ch9.ref_frame3.tx_power_index=3A:3A:3A:3A
ant1.ch9.ref_frame4.tx_power_index=40:40:40:40
ant1.ch9.ref_frame5.tx_power_index=3E:3E:3E:3E
ant1.ch9.ref_frame6.tx_power_index=34:34:34:34
ant1.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF
ant1.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE
# pp cw tx pwr
ant1.ch9.ref_frame0.post_tx_power_index=0x32

6
uwb/calibration-default.conf
View file

@ -17,7 +17,7 @@ ant0.ch5.ref_frame3.tx_power_index=33:33:33:33
ant0.ch5.ref_frame4.tx_power_index=3E:3E:3E:3E
ant0.ch5.ref_frame5.tx_power_index=3B:3B:3B:3B
ant0.ch5.ref_frame6.tx_power_index=32:32:32:32
ant0.ch5.ref_frame7.tx_power_index=FF:FF:FF:FF
ant0.ch5.ref_frame7.tx_power_index=FE:FE:FE:FE
# pp cw tx pwr
ant0.ch5.ref_frame0.post_tx_power_index=0x34
@ -66,7 +66,7 @@ ant0.ch9.ref_frame3.tx_power_index=3B:3B:3B:3B
ant0.ch9.ref_frame4.tx_power_index=3E:3E:3E:3E
ant0.ch9.ref_frame5.tx_power_index=37:37:37:37
ant0.ch9.ref_frame6.tx_power_index=39:39:39:39
ant0.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF
ant0.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE
# pp cw tx pwr
ant0.ch9.ref_frame0.post_tx_power_index=0x32
@ -115,7 +115,7 @@ ant1.ch9.ref_frame3.tx_power_index=3A:3A:3A:3A
ant1.ch9.ref_frame4.tx_power_index=40:40:40:40
ant1.ch9.ref_frame5.tx_power_index=3E:3E:3E:3E
ant1.ch9.ref_frame6.tx_power_index=34:34:34:34
ant1.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF
ant1.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE
# pp cw tx pwr
ant1.ch9.ref_frame0.post_tx_power_index=0x32

4
uwb/calibration.conf
View file

@ -34,6 +34,8 @@ ant3.ch9.pa_gain_offset=0x00
#Coex
wifi_coex_mode=01
wifi_coex_time_gap_t1=01
wifi_coex_time_gap=01
ch5.wifi_coex_enabled=01
ch9.wifi_coex_enabled=01
dual_rx_auto.accum_period=0x00

17
uwb/configuration.conf
View file

@ -2,6 +2,19 @@
[FIRA]ant_sets.ch5.range.rx_ant_set_ranging = 0
[FIRA]ant_sets.ch5.range.tx_ant_set_nonranging = 0
[FIRA]ant_sets.ch5.range.tx_ant_set_ranging = 0
[FIRA]ant_sets.ch5.azimuth.rx_ant_set_nonranging = 1
[FIRA]ant_sets.ch5.azimuth.rx_ant_set_ranging = 1
[FIRA]ant_sets.ch5.azimuth.tx_ant_set_nonranging = 1
[FIRA]ant_sets.ch5.azimuth.tx_ant_set_ranging = 1
[FIRA]ant_sets.ch5.elevation.rx_ant_set_nonranging = 2
[FIRA]ant_sets.ch5.elevation.rx_ant_set_ranging = 2
[FIRA]ant_sets.ch5.elevation.tx_ant_set_nonranging = 2
[FIRA]ant_sets.ch5.elevation.tx_ant_set_ranging = 2
[FIRA]ant_sets.ch5.azimuth_elevation.rx_ant_set_nonranging = 1
[FIRA]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_azimuth = 1
[FIRA]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_elevation = 2
[FIRA]ant_sets.ch5.azimuth_elevation.tx_ant_set_nonranging = 1
[FIRA]ant_sets.ch5.azimuth_elevation.tx_ant_set_ranging = 1
[FIRA]ant_sets.ch9.range.rx_ant_set_nonranging = 0
[FIRA]ant_sets.ch9.range.rx_ant_set_ranging = 0
[FIRA]ant_sets.ch9.range.tx_ant_set_nonranging = 0
@ -29,6 +42,8 @@
[CCC]ant_sets.ch9.range.tx_ant_set_nonranging = 0
[CCC]ant_sets.ch9.range.tx_ant_set_ranging = 0
[HAL]session_error_monitor_enable = 1
# Antenna Configuration
ant0.config=01
ant1.config=02
@ -119,4 +134,4 @@ post_tx.pattern_data=DD:DD:DD:DD:77:77:77:77
post_tx.pattern_repetitions=0x0002
# Ipatov / STS time difference threshold
ip_sts_sanity_thres_q2=0x48
ip_sts_sanity_thres_q2=0x0A