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

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

Browse source 
Change-Id: I1c75565ff3eb78a649a5f751d8b5998325ee13b5
This commit is contained in:
Android Build Coastguard Worker 2024-06-03 15:31:35 +00:00
commit 135674b3d8
39 changed files with 734 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

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
OWNERS
View file

@ -1,4 +1,4 @@
per-file perf/*,thermal/*= 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

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

7
aosp_husky_pgagnostic.mk
View file

@ -16,7 +16,10 @@
$(call inherit-product, device/google/shusky/aosp_husky.mk)
PRODUCT_NAME := aosp_husky_pgagnostic
PRODUCT_MODEL := AOSP page-size agnostic Husky 64K ELF
PRODUCT_MODEL := AOSP page-size agnostic Husky 16KB ELF
PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536
PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384
TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4

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

7
aosp_shiba_pgagnostic.mk
View file

@ -16,7 +16,10 @@
$(call inherit-product, device/google/shusky/aosp_shiba.mk)
PRODUCT_NAME := aosp_shiba_pgagnostic
PRODUCT_MODEL := AOSP page-size agnostic Shiba 64K ELF
PRODUCT_MODEL := AOSP page-size agnostic Shiba 16KB ELF
PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536
PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384
TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4

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 -->

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 -->

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"

55
device-husky.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_HUSKY_KERNEL_VERSION
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_HUSKY_KERNEL_VERSION)
endif
ifdef RELEASE_GOOGLE_HUSKY_KERNEL_DIR
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_HUSKY_VERSION)
# Keeps flexibility for kasan and ufs builds
TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_HUSKY_KERNEL_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_HUSKY_KERNEL_DIR)/kernel-headers
else
TARGET_KERNEL_DIR ?= device/google/shusky-kernel
TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers
endif
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_HUSKY_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_HUSKY_DIR)/kernel-headers
LOCAL_PATH := device/google/shusky
@ -39,6 +31,15 @@ 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)
@ -240,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
@ -287,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 += \
@ -324,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)
@ -372,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
@ -384,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 += \
@ -405,7 +396,7 @@ PRODUCT_VENDOR_PROPERTIES += \
# Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.build.svn=22
ro.vendor.build.svn=27
# WLC userdebug specific
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
@ -475,3 +466,9 @@ 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

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 \

52
device-shiba.mk
View file

@ -17,21 +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)
ifdef RELEASE_GOOGLE_SHIBA_KERNEL_VERSION
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_SHIBA_KERNEL_VERSION)
endif
ifdef RELEASE_GOOGLE_SHIBA_KERNEL_DIR
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_SHIBA_VERSION)
# Keeps flexibility for kasan and ufs builds
TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_SHIBA_KERNEL_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_SHIBA_KERNEL_DIR)/kernel-headers
else
TARGET_KERNEL_DIR ?= device/google/shusky-kernel
TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers
endif
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)
@ -227,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
@ -273,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
@ -306,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)
@ -358,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 += \
@ -379,7 +373,7 @@ PRODUCT_VENDOR_PROPERTIES += \
# Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.build.svn=22
ro.vendor.build.svn=26
# P23 Devices no longer need rlsservice
PRODUCT_VENDOR_PROPERTIES += \
@ -441,3 +435,9 @@ 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

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

10
aosp_husky_61_pgagnostic.mk → husky_generic.mk
View file

@ -1,5 +1,5 @@
#
# Copyright 2023 The Android Open-Source Project
# 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.
@ -13,10 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
$(call inherit-product, device/google/pixel_61/aosp_husky_61.mk)
PRODUCT_NAME := aosp_husky_61_pgagnostic
PRODUCT_MODEL := AOSP page-size agnostic Husky 64K ELF
$(call inherit-product, device/google/shusky/device-husky.mk)
PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536
# preloaded_nanoapps.json
PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p23_common

2
location/gps.xml
View file

@ -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.xml.hk3
View file

@ -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.xml.sb3
View file

@ -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"

200
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",
@ -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",
@ -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",
@ -2920,6 +3041,7 @@
"Value": "20 80"
}
],
"GpuSysfsPath" : "/sys/devices/platform/1f000000.mali",
"AdpfConfig": [
{
"Name": "REFRESH_120FPS",
@ -2934,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",
@ -2958,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",
@ -2982,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",
@ -3011,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",
@ -3035,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",
@ -3059,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
}
]
}

188
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",
@ -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",
@ -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",
@ -2717,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",
@ -2740,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",
@ -2764,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",
@ -2794,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
},
@ -2818,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
},
@ -2842,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
}

200
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",
@ -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",
@ -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",
@ -2824,6 +2945,7 @@
"Value": "20 80"
}
],
"GpuSysfsPath" : "/sys/devices/platform/1f000000.mali",
"AdpfConfig": [
{
"Name": "REFRESH_120FPS",
@ -2838,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",
@ -2862,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",
@ -2886,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",
@ -2915,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",
@ -2939,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",
@ -2963,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

10
aosp_shiba_61_pgagnostic.mk → ripcurrent_generic.mk
View file

@ -1,5 +1,5 @@
#
# Copyright 2023 The Android Open-Source Project
# 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.
@ -13,10 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
$(call inherit-product, device/google/pixel_61/aosp_shiba_61.mk)
PRODUCT_NAME := aosp_shiba_61_pgagnostic
PRODUCT_MODEL := AOSP page-size agnostic Shiba 64K ELF
$(call inherit-product, device/google/shusky/device-ripcurrent.mk)
PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536
# preloaded_nanoapps.json
PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p23_common

2
self-extractors_husky/google_devices/staging/Android.mk.template
View file

@ -48,7 +48,7 @@ LOCAL_PRIVILEGED_MODULE := true
LOCAL_MODULE_OWNER := samsung
LOCAL_MODULE_CLASS := APPS
LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
LOCAL_CERTIFICATE := platform
LOCAL_CERTIFICATE := PRESIGNED
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE

2
self-extractors_shiba/google_devices/staging/Android.mk.template
View file

@ -48,7 +48,7 @@ LOCAL_PRIVILEGED_MODULE := true
LOCAL_MODULE_OWNER := samsung
LOCAL_MODULE_CLASS := APPS
LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
LOCAL_CERTIFICATE := platform
LOCAL_CERTIFICATE := PRESIGNED
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE

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

BIN
shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gpj41_in.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 536 KiB

After

Width:  |  Height:  |  Size: 608 KiB

Before After
Before After

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