Switch makefile owners to MK_OWNERS am: 35d0d9daef am: 2ddfd5a4fe
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/3106663
Change-Id: Ia8beda340aed4795ca656573f82130d93757d76d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/aosp_raven.mk b/aosp_raven.mk
index 6a29283..f434886 100644
--- a/aosp_raven.mk
+++ b/aosp_raven.mk
@@ -15,7 +15,7 @@
#
$(call inherit-product, device/google/gs101/aosp_common.mk)
-$(call inherit-product, device/google/raviole/device-raven.mk)
+$(call inherit-product, device/google/raviole/raven_generic.mk)
PRODUCT_NAME := aosp_raven
PRODUCT_NAME_FOR_ATTESTATION := raven
diff --git a/aosp_slider.mk b/aosp_slider.mk
index 29351f5..9e65926 100644
--- a/aosp_slider.mk
+++ b/aosp_slider.mk
@@ -14,7 +14,7 @@
# limitations under the License.
#
$(call inherit-product, device/google/gs101/aosp_common.mk)
-$(call inherit-product, device/google/raviole/device-slider.mk)
+$(call inherit-product, device/google/raviole/slider_generic.mk)
PRODUCT_NAME := aosp_slider
PRODUCT_DEVICE := slider
diff --git a/aosp_whitefin.mk b/aosp_whitefin.mk
index bcdd616..212e7a6 100644
--- a/aosp_whitefin.mk
+++ b/aosp_whitefin.mk
@@ -14,7 +14,7 @@
# limitations under the License.
#
$(call inherit-product, device/google/gs101/aosp_common.mk)
-$(call inherit-product, device/google/raviole/device-whitefin.mk)
+$(call inherit-product, device/google/raviole/whitefin_generic.mk)
PRODUCT_NAME := aosp_whitefin
PRODUCT_DEVICE := whitefin
diff --git a/audio/oriole/config/audio_policy_configuration.xml b/audio/oriole/config/audio_policy_configuration.xml
index b40204e..03a695e 100644
--- a/audio/oriole/config/audio_policy_configuration.xml
+++ b/audio/oriole/config/audio_policy_configuration.xml
@@ -135,10 +135,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">
@@ -149,8 +145,6 @@
</devicePort>
<devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
</devicePort>
- <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
- </devicePort>
<devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
</devicePort>
<!-- Input devices declaration, i.e. Source DEVICE PORT -->
@@ -158,8 +152,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"
diff --git a/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml
index 0f85d74..63d90c2 100644
--- a/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -135,10 +135,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">
@@ -149,8 +145,6 @@
</devicePort>
<devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
</devicePort>
- <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
- </devicePort>
<devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
</devicePort>
<!-- Input devices declaration, i.e. Source DEVICE PORT -->
@@ -158,8 +152,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">
diff --git a/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index a55b5d1..ab9a002 100644
--- a/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -131,10 +131,6 @@
</devicePort>
<devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
</devicePort>
- <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
- </devicePort>
- <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
- </devicePort>
<devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
</devicePort>
<devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@@ -145,8 +141,6 @@
</devicePort>
<devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
</devicePort>
- <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
- </devicePort>
<devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
</devicePort>
<!-- Input devices declaration, i.e. Source DEVICE PORT -->
@@ -154,8 +148,6 @@
</devicePort>
<devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
</devicePort>
- <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
- </devicePort>
<devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
</devicePort>
<devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source">
diff --git a/audio/oriole/config/audio_policy_configuration_le_offload_disabled.xml b/audio/oriole/config/audio_policy_configuration_le_offload_disabled.xml
index 72748dd..2e898e5 100644
--- a/audio/oriole/config/audio_policy_configuration_le_offload_disabled.xml
+++ b/audio/oriole/config/audio_policy_configuration_le_offload_disabled.xml
@@ -135,10 +135,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">
@@ -149,8 +145,6 @@
</devicePort>
<devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
</devicePort>
- <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
- </devicePort>
<devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
</devicePort>
<!-- Input devices declaration, i.e. Source DEVICE PORT -->
@@ -158,8 +152,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"
diff --git a/audio/raven/config/audio_policy_configuration.xml b/audio/raven/config/audio_policy_configuration.xml
index b40204e..03a695e 100644
--- a/audio/raven/config/audio_policy_configuration.xml
+++ b/audio/raven/config/audio_policy_configuration.xml
@@ -135,10 +135,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">
@@ -149,8 +145,6 @@
</devicePort>
<devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
</devicePort>
- <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
- </devicePort>
<devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
</devicePort>
<!-- Input devices declaration, i.e. Source DEVICE PORT -->
@@ -158,8 +152,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"
diff --git a/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml
index 0f85d74..63d90c2 100644
--- a/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -135,10 +135,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">
@@ -149,8 +145,6 @@
</devicePort>
<devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
</devicePort>
- <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
- </devicePort>
<devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
</devicePort>
<!-- Input devices declaration, i.e. Source DEVICE PORT -->
@@ -158,8 +152,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">
diff --git a/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index a55b5d1..ab9a002 100644
--- a/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -131,10 +131,6 @@
</devicePort>
<devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
</devicePort>
- <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
- </devicePort>
- <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
- </devicePort>
<devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
</devicePort>
<devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@@ -145,8 +141,6 @@
</devicePort>
<devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
</devicePort>
- <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
- </devicePort>
<devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
</devicePort>
<!-- Input devices declaration, i.e. Source DEVICE PORT -->
@@ -154,8 +148,6 @@
</devicePort>
<devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
</devicePort>
- <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
- </devicePort>
<devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
</devicePort>
<devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source">
diff --git a/audio/raven/config/audio_policy_configuration_le_offload_disabled.xml b/audio/raven/config/audio_policy_configuration_le_offload_disabled.xml
index 72748dd..2e898e5 100644
--- a/audio/raven/config/audio_policy_configuration_le_offload_disabled.xml
+++ b/audio/raven/config/audio_policy_configuration_le_offload_disabled.xml
@@ -135,10 +135,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">
@@ -149,8 +145,6 @@
</devicePort>
<devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
</devicePort>
- <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
- </devicePort>
<devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
</devicePort>
<!-- Input devices declaration, i.e. Source DEVICE PORT -->
@@ -158,8 +152,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"
diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf
index 4208da8..e12005e 100644
--- a/bluetooth/bt_vendor_overlay.conf
+++ b/bluetooth/bt_vendor_overlay.conf
@@ -2,4 +2,7 @@
BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus
+# Update BQR Event Mask property value
+BqrEventMaskValueUpdate = 262238
+
BtOpusEnabled = true
diff --git a/device-oriole.mk b/device-oriole.mk
index 45da46b..f72aefe 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -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/raviole-kernel
-TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
-
-ifdef RELEASE_GOOGLE_ORIOLE_KERNEL_VERSION
-TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_ORIOLE_KERNEL_VERSION)
-endif
-
-ifdef RELEASE_GOOGLE_ORIOLE_KERNEL_DIR
-TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_ORIOLE_KERNEL_DIR)
-TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_ORIOLE_KERNEL_DIR)/kernel-headers
-endif
+TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_ORIOLE_VERSION)
+# Keeps flexibility for kasan and ufs builds
+TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_ORIOLE_DIR)
+TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_ORIOLE_DIR)/kernel-headers
$(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-oriole.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
@@ -48,13 +41,6 @@
# Fingerprint HAL
GOODIX_CONFIG_BUILD_VERSION := g6_trusty
-ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q1
-else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q2
-else
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/trunk
-endif
$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk)
ifeq ($(filter factory%, $(TARGET_PRODUCT)),)
$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk)
@@ -208,7 +194,7 @@
# Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \
- ro.vendor.build.svn=78
+ ro.vendor.build.svn=83
# Set support hide display cutout feature
PRODUCT_PRODUCT_PROPERTIES += \
@@ -246,13 +232,6 @@
# Trusty liboemcrypto.so
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts
-ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1
-else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2
-else
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk
-endif
# Set support one-handed mode
PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/device-raven.mk b/device-raven.mk
index 8eb8091..a14a304 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -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/raviole-kernel
-TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
-
-ifdef RELEASE_GOOGLE_RAVEN_KERNEL_VERSION
-TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_RAVEN_KERNEL_VERSION)
-endif
-
-ifdef RELEASE_GOOGLE_RAVEN_KERNEL_DIR
-TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_RAVEN_KERNEL_DIR)
-TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_RAVEN_KERNEL_DIR)/kernel-headers
-endif
+TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_RAVEN_VERSION)
+# Keeps flexibility for kasan and ufs builds
+TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_RAVEN_DIR)
+TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_RAVEN_DIR)/kernel-headers
$(call inherit-product, device/google/raviole/uwb/uwb_calibration_country.mk)
$(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-raven.mk)
@@ -48,13 +41,6 @@
# Fingerprint HAL
GOODIX_CONFIG_BUILD_VERSION := g6_trusty
-ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q1
-else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q2
-else
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/trunk
-endif
$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk)
ifeq ($(filter factory%, $(TARGET_PRODUCT)),)
$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk)
@@ -212,7 +198,7 @@
# Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \
- ro.vendor.build.svn=78
+ ro.vendor.build.svn=83
# Set support hide display cutout feature
PRODUCT_PRODUCT_PROPERTIES += \
@@ -254,13 +240,6 @@
# Trusty liboemcrypto.so
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts
-ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1
-else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2
-else
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk
-endif
# Set support one-handed mode
PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/device-slider.mk b/device-slider.mk
index 946c508..09eb645 100644
--- a/device-slider.mk
+++ b/device-slider.mk
@@ -14,8 +14,9 @@
# limitations under the License.
#
-TARGET_KERNEL_DIR ?= device/google/raviole-kernel
-TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
+# Keeps flexibility for kasan and ufs builds
+TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_ORIOLE_DIR)
+TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_ORIOLE_DIR)/kernel-headers
$(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-slider.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
@@ -105,13 +106,6 @@
# Trusty liboemcrypto.so
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts
-ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1
-else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2
-else
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk
-endif
# tetheroffload HAL
PRODUCT_PACKAGES += \
diff --git a/device-whitefin.mk b/device-whitefin.mk
index 3edde0d..f7e19c3 100644
--- a/device-whitefin.mk
+++ b/device-whitefin.mk
@@ -14,8 +14,9 @@
# limitations under the License.
#
-TARGET_KERNEL_DIR ?= device/google/raviole-kernel
-TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
+# Keeps flexibility for kasan and ufs builds
+TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_ORIOLE_DIR)
+TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_ORIOLE_DIR)/kernel-headers
$(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-whitefin.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
@@ -88,13 +89,6 @@
# Trusty liboemcrypto.so
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts
-ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1
-else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2
-else
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk
-endif
# tetheroffload HAL
PRODUCT_PACKAGES += \
diff --git a/factory_raven.mk b/factory_raven.mk
index 48226c4..1b41a1c 100644
--- a/factory_raven.mk
+++ b/factory_raven.mk
@@ -32,3 +32,6 @@
# Factory binaries of camera
PRODUCT_PACKAGES += fatp_gn1_hat_tool fatp_imx586_hat_tool
+
+# preloaded_nanoapps.json
+PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory
diff --git a/factory_slider.mk b/factory_slider.mk
index 1c51e91..1359fc6 100644
--- a/factory_slider.mk
+++ b/factory_slider.mk
@@ -23,3 +23,6 @@
PRODUCT_MODEL := Factory build on Slider
PRODUCT_BRAND := Android
PRODUCT_MANUFACTURER := Google
+
+# preloaded_nanoapps.json
+PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory
diff --git a/factory_whitefin.mk b/factory_whitefin.mk
index 0dd0a4f..4d360c6 100644
--- a/factory_whitefin.mk
+++ b/factory_whitefin.mk
@@ -29,3 +29,5 @@
PRODUCT_PROPERTY_OVERRIDES += \
ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
+# preloaded_nanoapps.json
+PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory
diff --git a/location/gps.xml b/location/gps.xml
index 52827b8..fb8dd62 100644
--- a/location/gps.xml
+++ b/location/gps.xml
@@ -68,7 +68,7 @@
<gll
PpsEnable="true"
LogPriMask="LOG_INFO"
- LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI | LOG_MEASAPI"
+ LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
diff --git a/location/gps.xml.oriole b/location/gps.xml.oriole
index 323fe17..7dc695c 100644
--- a/location/gps.xml.oriole
+++ b/location/gps.xml.oriole
@@ -68,7 +68,7 @@
<gll
PpsEnable="true"
LogPriMask="LOG_INFO"
- LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI | LOG_MEASAPI"
+ LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
diff --git a/location/gps.xml.raven b/location/gps.xml.raven
index f205e75..31cf6c9 100644
--- a/location/gps.xml.raven
+++ b/location/gps.xml.raven
@@ -68,7 +68,7 @@
<gll
PpsEnable="true"
LogPriMask="LOG_INFO"
- LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI | LOG_MEASAPI"
+ LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk
index a138bc2..757ee50 100644
--- a/oriole/BoardConfig.mk
+++ b/oriole/BoardConfig.mk
@@ -18,19 +18,16 @@
BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
# The modules which need to be loaded in sequential
+BOARD_KERNEL_CMDLINE += fips140.load_sequential=1
BOARD_KERNEL_CMDLINE += exynos_mfc.load_sequential=1
BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1
BOARD_KERNEL_CMDLINE += g2d.load_sequential=1
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_ORIOLE_RADIO_DIR)
-ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
-else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
-else
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
-endif
+RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)
+$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR))
ifdef AUTOMOTIVE_PRODUCT_PATH
#RBC# include_top device/google/auto_tcu
diff --git a/powerhint-oriole-mainline.json b/powerhint-oriole-mainline.json
index 55adc6b..29dd8ab 100644
--- a/powerhint-oriole-mainline.json
+++ b/powerhint-oriole-mainline.json
@@ -1230,16 +1230,25 @@
"PID_Du": 0,
"UclampMin_On": true,
"UclampMin_Init": 232,
+ "UclampMin_LoadUp": 480,
+ "UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
"ReportingRateLimitNs": 83333330,
- "EarlyBoost_On": false,
- "EarlyBoost_TimeFactor": 0,
"TargetTimeFactor": 1,
- "StaleTimeFactor": 15
+ "StaleTimeFactor": 15,
+ "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",
@@ -1254,16 +1263,25 @@
"PID_Du": 0,
"UclampMin_On": true,
"UclampMin_Init": 162,
+ "UclampMin_LoadUp": 480,
+ "UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
"ReportingRateLimitNs": 111111110,
- "EarlyBoost_On": false,
- "EarlyBoost_TimeFactor": 0,
"TargetTimeFactor": 1,
- "StaleTimeFactor": 15
+ "StaleTimeFactor": 15,
+ "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",
@@ -1278,16 +1296,25 @@
"PID_Du": 0,
"UclampMin_On": true,
"UclampMin_Init": 162,
+ "UclampMin_LoadUp": 480,
+ "UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
"ReportingRateLimitNs": 166666660,
- "EarlyBoost_On": false,
- "EarlyBoost_TimeFactor": 0,
"TargetTimeFactor": 1,
- "StaleTimeFactor": 15
+ "StaleTimeFactor": 15,
+ "HeuristicBoost_On": true,
+ "HBoostOnMissedCycles": 8,
+ "HBoostOffMaxAvgRatio": 4.0,
+ "HBoostOffMissedCycles": 5,
+ "HBoostPidPuFactor": 0.5,
+ "HBoostUclampMin": 722,
+ "JankCheckTimeFactor": 1.2,
+ "LowFrameRateThreshold": 25,
+ "MaxRecordsNum": 300
},
{
"Name": "UiHighBoostWithoutPid",
@@ -1332,8 +1359,6 @@
"UclampMin_High": 53,
"UclampMin_Low": 53,
"ReportingRateLimitNs": 1,
- "EarlyBoost_On": false,
- "EarlyBoost_TimeFactor": 0,
"TargetTimeFactor": 1,
"StaleTimeFactor": 5
},
@@ -1356,8 +1381,6 @@
"UclampMin_High": 0,
"UclampMin_Low": 0,
"ReportingRateLimitNs": 1,
- "EarlyBoost_On": false,
- "EarlyBoost_TimeFactor": 0,
"TargetTimeFactor": 1,
"StaleTimeFactor": 5
}
diff --git a/powerhint-oriole.json b/powerhint-oriole.json
index 47e6bf1..9264d09 100644
--- a/powerhint-oriole.json
+++ b/powerhint-oriole.json
@@ -1746,16 +1746,26 @@
"PID_Du": 0.0,
"UclampMin_On": true,
"UclampMin_Init": 232,
+ "UclampMin_LoadUp": 480,
+ "UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
+ "UclampMax_Efficient": 400,
"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",
@@ -1770,16 +1780,26 @@
"PID_Du": 0.0,
"UclampMin_On": true,
"UclampMin_Init": 162,
+ "UclampMin_LoadUp": 480,
+ "UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
+ "UclampMax_Efficient": 400,
"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",
@@ -1794,16 +1814,26 @@
"PID_Du": 0.0,
"UclampMin_On": true,
"UclampMin_Init": 162,
+ "UclampMin_LoadUp": 480,
+ "UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
+ "UclampMax_Efficient": 400,
"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",
@@ -1823,9 +1853,8 @@
"UclampMin_Init": 250,
"UclampMin_High": 197,
"UclampMin_Low": 197,
+ "UclampMax_Efficient": 400,
"ReportingRateLimitNs": 1,
- "EarlyBoost_On": false,
- "EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0
},
@@ -1847,9 +1876,8 @@
"UclampMin_Init": 250,
"UclampMin_High": 53,
"UclampMin_Low": 53,
+ "UclampMax_Efficient": 400,
"ReportingRateLimitNs": 1,
- "EarlyBoost_On": false,
- "EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0
},
@@ -1871,9 +1899,8 @@
"UclampMin_Init": 250,
"UclampMin_High": 0,
"UclampMin_Low": 0,
+ "UclampMax_Efficient": 400,
"ReportingRateLimitNs": 1,
- "EarlyBoost_On": false,
- "EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0
}
diff --git a/powerhint-raven-mainline.json b/powerhint-raven-mainline.json
index 89e38f0..a748e0e 100644
--- a/powerhint-raven-mainline.json
+++ b/powerhint-raven-mainline.json
@@ -1211,16 +1211,25 @@
"PID_Du": 0,
"UclampMin_On": true,
"UclampMin_Init": 232,
+ "UclampMin_LoadUp": 480,
+ "UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
"ReportingRateLimitNs": 83333330,
- "EarlyBoost_On": false,
- "EarlyBoost_TimeFactor": 0,
"TargetTimeFactor": 1,
- "StaleTimeFactor": 15
+ "StaleTimeFactor": 15,
+ "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",
@@ -1235,16 +1244,25 @@
"PID_Du": 0,
"UclampMin_On": true,
"UclampMin_Init": 162,
+ "UclampMin_LoadUp": 480,
+ "UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
"ReportingRateLimitNs": 111111110,
- "EarlyBoost_On": false,
- "EarlyBoost_TimeFactor": 0,
"TargetTimeFactor": 1,
- "StaleTimeFactor": 15
+ "StaleTimeFactor": 15,
+ "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",
@@ -1259,16 +1277,25 @@
"PID_Du": 0,
"UclampMin_On": true,
"UclampMin_Init": 162,
+ "UclampMin_LoadUp": 480,
+ "UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
"ReportingRateLimitNs": 166666660,
- "EarlyBoost_On": false,
- "EarlyBoost_TimeFactor": 0,
"TargetTimeFactor": 1,
- "StaleTimeFactor": 15
+ "StaleTimeFactor": 15,
+ "HeuristicBoost_On": true,
+ "HBoostOnMissedCycles": 8,
+ "HBoostOffMaxAvgRatio": 4.0,
+ "HBoostOffMissedCycles": 5,
+ "HBoostPidPuFactor": 0.5,
+ "HBoostUclampMin": 722,
+ "JankCheckTimeFactor": 1.2,
+ "LowFrameRateThreshold": 25,
+ "MaxRecordsNum": 300
},
{
"Name": "UiHighBoostWithoutPid",
@@ -1289,8 +1316,6 @@
"UclampMin_High": 197,
"UclampMin_Low": 197,
"ReportingRateLimitNs": 1,
- "EarlyBoost_On": false,
- "EarlyBoost_TimeFactor": 0,
"TargetTimeFactor": 1,
"StaleTimeFactor": 5
},
@@ -1313,8 +1338,6 @@
"UclampMin_High": 53,
"UclampMin_Low": 53,
"ReportingRateLimitNs": 1,
- "EarlyBoost_On": false,
- "EarlyBoost_TimeFactor": 0,
"TargetTimeFactor": 1,
"StaleTimeFactor": 5
},
@@ -1337,8 +1360,6 @@
"UclampMin_High": 0,
"UclampMin_Low": 0,
"ReportingRateLimitNs": 1,
- "EarlyBoost_On": false,
- "EarlyBoost_TimeFactor": 0,
"TargetTimeFactor": 1,
"StaleTimeFactor": 5
}
diff --git a/powerhint-raven.json b/powerhint-raven.json
index ebd95a5..af6d3c7 100644
--- a/powerhint-raven.json
+++ b/powerhint-raven.json
@@ -1727,16 +1727,26 @@
"PID_Du": 0.0,
"UclampMin_On": true,
"UclampMin_Init": 232,
+ "UclampMin_LoadUp": 480,
+ "UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
+ "UclampMax_Efficient": 400,
"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",
@@ -1751,16 +1761,26 @@
"PID_Du": 0.0,
"UclampMin_On": true,
"UclampMin_Init": 162,
+ "UclampMin_LoadUp": 480,
+ "UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
+ "UclampMax_Efficient": 400,
"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",
@@ -1775,16 +1795,26 @@
"PID_Du": 0.0,
"UclampMin_On": true,
"UclampMin_Init": 162,
+ "UclampMin_LoadUp": 480,
+ "UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
+ "UclampMax_Efficient": 400,
"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",
@@ -1804,9 +1834,8 @@
"UclampMin_Init": 250,
"UclampMin_High": 197,
"UclampMin_Low": 197,
+ "UclampMax_Efficient": 400,
"ReportingRateLimitNs": 1,
- "EarlyBoost_On": false,
- "EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0
},
@@ -1828,9 +1857,8 @@
"UclampMin_Init": 250,
"UclampMin_High": 53,
"UclampMin_Low": 53,
+ "UclampMax_Efficient": 400,
"ReportingRateLimitNs": 1,
- "EarlyBoost_On": false,
- "EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0
},
@@ -1852,9 +1880,8 @@
"UclampMin_Init": 250,
"UclampMin_High": 0,
"UclampMin_Low": 0,
+ "UclampMax_Efficient": 400,
"ReportingRateLimitNs": 1,
- "EarlyBoost_On": false,
- "EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0
}
diff --git a/powerhint-slider.json b/powerhint-slider.json
index 5726aa9..98f770e 100644
--- a/powerhint-slider.json
+++ b/powerhint-slider.json
@@ -1503,6 +1503,7 @@
"UclampMin_Init": 232,
"UclampMin_High": 480,
"UclampMin_Low": 2,
+ "UclampMax_Efficient": 400,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
@@ -1510,7 +1511,16 @@
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
- "StaleTimeFactor": 20.0
+ "StaleTimeFactor": 20.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",
@@ -1527,6 +1537,7 @@
"UclampMin_Init": 162,
"UclampMin_High": 480,
"UclampMin_Low": 2,
+ "UclampMax_Efficient": 400,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
@@ -1534,7 +1545,16 @@
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
- "StaleTimeFactor": 20.0
+ "StaleTimeFactor": 20.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",
@@ -1551,6 +1571,7 @@
"UclampMin_Init": 162,
"UclampMin_High": 480,
"UclampMin_Low": 2,
+ "UclampMax_Efficient": 400,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
@@ -1558,7 +1579,16 @@
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
- "StaleTimeFactor": 20.0
+ "StaleTimeFactor": 20.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",
@@ -1578,6 +1608,7 @@
"UclampMin_Init": 250,
"UclampMin_High": 197,
"UclampMin_Low": 197,
+ "UclampMax_Efficient": 400,
"ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
@@ -1602,6 +1633,7 @@
"UclampMin_Init": 250,
"UclampMin_High": 53,
"UclampMin_Low": 53,
+ "UclampMax_Efficient": 400,
"ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
@@ -1626,6 +1658,7 @@
"UclampMin_Init": 250,
"UclampMin_High": 0,
"UclampMin_Low": 0,
+ "UclampMax_Efficient": 400,
"ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
diff --git a/powerhint-whitefin.json b/powerhint-whitefin.json
index d44d6f9..a53293f 100644
--- a/powerhint-whitefin.json
+++ b/powerhint-whitefin.json
@@ -1470,6 +1470,7 @@
"UclampMin_Init": 232,
"UclampMin_High": 480,
"UclampMin_Low": 2,
+ "UclampMax_Efficient": 400,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
@@ -1477,7 +1478,16 @@
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
- "StaleTimeFactor": 20.0
+ "StaleTimeFactor": 20.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",
@@ -1494,6 +1504,7 @@
"UclampMin_Init": 162,
"UclampMin_High": 480,
"UclampMin_Low": 2,
+ "UclampMax_Efficient": 400,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
@@ -1501,7 +1512,16 @@
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
- "StaleTimeFactor": 20.0
+ "StaleTimeFactor": 20.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",
@@ -1518,6 +1538,7 @@
"UclampMin_Init": 162,
"UclampMin_High": 480,
"UclampMin_Low": 2,
+ "UclampMax_Efficient": 400,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
@@ -1525,7 +1546,16 @@
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
- "StaleTimeFactor": 20.0
+ "StaleTimeFactor": 20.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",
@@ -1545,6 +1575,7 @@
"UclampMin_Init": 250,
"UclampMin_High": 197,
"UclampMin_Low": 197,
+ "UclampMax_Efficient": 400,
"ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
@@ -1569,6 +1600,7 @@
"UclampMin_Init": 250,
"UclampMin_High": 53,
"UclampMin_Low": 53,
+ "UclampMax_Efficient": 400,
"ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
@@ -1593,6 +1625,7 @@
"UclampMin_Init": 250,
"UclampMin_High": 0,
"UclampMin_Low": 0,
+ "UclampMax_Efficient": 400,
"ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk
index 70f7077..06f97ae 100644
--- a/raven/BoardConfig.mk
+++ b/raven/BoardConfig.mk
@@ -18,19 +18,16 @@
BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
# The modules which need to be loaded in sequential
+BOARD_KERNEL_CMDLINE += fips140.load_sequential=1
BOARD_KERNEL_CMDLINE += exynos_mfc.load_sequential=1
BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1
BOARD_KERNEL_CMDLINE += g2d.load_sequential=1
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RAVEN_RADIO_DIR)
-ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
-else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
-else
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
-endif
+RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR ?= pdk# Keep this for pdk TODO: b/327119000
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR)
+$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR))
ifdef AUTOMOTIVE_PRODUCT_PATH
#RBC# include_top device/google/auto_tcu
diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml
index c8d8730..ea1bd1d 100644
--- a/raven/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml
@@ -43,7 +43,9 @@
<!-- Radius of the software rounded corners. -->
- <dimen name="rounded_corner_radius">50px</dimen>
+ <dimen name="rounded_corner_radius">67px</dimen>
+ <dimen name="rounded_corner_radius_top">67px</dimen>
+ <dimen name="rounded_corner_radius_bottom">66px</dimen>
<!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
<dimen name="rounded_corner_radius_adjustment">5px</dimen>
diff --git a/raven_generic.mk b/raven_generic.mk
new file mode 100644
index 0000000..6b16105
--- /dev/null
+++ b/raven_generic.mk
@@ -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/raviole/device-raven.mk)
+
+# preloaded_nanoapps.json
+PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/raven
diff --git a/slider/BoardConfig.mk b/slider/BoardConfig.mk
index 0c3d11f..917b79a 100644
--- a/slider/BoardConfig.mk
+++ b/slider/BoardConfig.mk
@@ -15,13 +15,9 @@
#
TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
TARGET_BOOTLOADER_BOARD_NAME := slider
-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_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)
+$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR))
TARGET_SCREEN_DENSITY := 560
USES_DEVICE_GOOGLE_RAVIOLE := true
diff --git a/slider_generic.mk b/slider_generic.mk
new file mode 100644
index 0000000..419e587
--- /dev/null
+++ b/slider_generic.mk
@@ -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/raviole/device-slider.mk)
+
+# preloaded_nanoapps.json
+PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/slider
diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json
index 372e851..ad24136 100644
--- a/thermal_info_config_oriole.json
+++ b/thermal_info_config_oriole.json
@@ -608,38 +608,6 @@
"Hidden":true
},
{
- "Name":"soft_ocp_cpu2",
- "Type":"BCL_CURRENT",
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 9000, "NAN", "NAN"],
- "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
- "Multiplier":1,
- "Hidden":true
- },
- {
- "Name":"soft_ocp_cpu1",
- "Type":"BCL_CURRENT",
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 7000, "NAN", "NAN"],
- "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
- "Multiplier":1,
- "Hidden":true
- },
- {
- "Name":"soft_ocp_tpu",
- "Type":"BCL_CURRENT",
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8500, "NAN", "NAN"],
- "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
- "Multiplier":1,
- "Hidden":true
- },
- {
- "Name":"soft_ocp_gpu",
- "Type":"BCL_CURRENT",
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 9000, "NAN", "NAN"],
- "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
- "Multiplier":1,
- "Hidden":true
- },
- {
"Name":"TPU",
"Type":"NPU",
"HotThreshold":[
diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json
index c3289e2..6f3b0d0 100644
--- a/thermal_info_config_raven.json
+++ b/thermal_info_config_raven.json
@@ -598,38 +598,6 @@
"Hidden":true
},
{
- "Name":"soft_ocp_cpu2",
- "Type":"BCL_CURRENT",
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"],
- "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
- "Multiplier":1,
- "Hidden":true
- },
- {
- "Name":"soft_ocp_cpu1",
- "Type":"BCL_CURRENT",
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 7000, "NAN", "NAN"],
- "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
- "Multiplier":1,
- "Hidden":true
- },
- {
- "Name":"soft_ocp_tpu",
- "Type":"BCL_CURRENT",
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8500, "NAN", "NAN"],
- "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
- "Multiplier":1,
- "Hidden":true
- },
- {
- "Name":"soft_ocp_gpu",
- "Type":"BCL_CURRENT",
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 9000, "NAN", "NAN"],
- "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
- "Multiplier":1,
- "Hidden":true
- },
- {
"Name":"TPU",
"Type":"NPU",
"HotThreshold":[
diff --git a/thermal_info_config_slider.json b/thermal_info_config_slider.json
index f08cd9f..16c795c 100644
--- a/thermal_info_config_slider.json
+++ b/thermal_info_config_slider.json
@@ -258,70 +258,6 @@
"Monitor":false
},
{
- "Name":"soft_ocp_cpu2",
- "Type":"BCL_CURRENT",
- "HotThreshold":[
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- 9,
- "NAN",
- "NAN"
- ],
- "VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
- },
- {
- "Name":"soft_ocp_cpu1",
- "Type":"BCL_CURRENT",
- "HotThreshold":[
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- 7.00,
- "NAN",
- "NAN"
- ],
- "VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
- },
- {
- "Name":"soft_ocp_tpu",
- "Type":"BCL_CURRENT",
- "HotThreshold":[
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- 8.5,
- "NAN",
- "NAN"
- ],
- "VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
- },
- {
- "Name":"soft_ocp_gpu",
- "Type":"BCL_CURRENT",
- "HotThreshold":[
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- 9,
- "NAN",
- "NAN"
- ],
- "VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
- },
- {
"Name":"TPU",
"Type":"NPU",
"HotThreshold":[
diff --git a/thermal_info_config_whitefin.json b/thermal_info_config_whitefin.json
index f08cd9f..16c795c 100644
--- a/thermal_info_config_whitefin.json
+++ b/thermal_info_config_whitefin.json
@@ -258,70 +258,6 @@
"Monitor":false
},
{
- "Name":"soft_ocp_cpu2",
- "Type":"BCL_CURRENT",
- "HotThreshold":[
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- 9,
- "NAN",
- "NAN"
- ],
- "VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
- },
- {
- "Name":"soft_ocp_cpu1",
- "Type":"BCL_CURRENT",
- "HotThreshold":[
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- 7.00,
- "NAN",
- "NAN"
- ],
- "VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
- },
- {
- "Name":"soft_ocp_tpu",
- "Type":"BCL_CURRENT",
- "HotThreshold":[
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- 8.5,
- "NAN",
- "NAN"
- ],
- "VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
- },
- {
- "Name":"soft_ocp_gpu",
- "Type":"BCL_CURRENT",
- "HotThreshold":[
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- 9,
- "NAN",
- "NAN"
- ],
- "VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
- },
- {
"Name":"TPU",
"Type":"NPU",
"HotThreshold":[
diff --git a/whitefin/BoardConfig.mk b/whitefin/BoardConfig.mk
index e824c17..e28f7bf 100644
--- a/whitefin/BoardConfig.mk
+++ b/whitefin/BoardConfig.mk
@@ -15,13 +15,9 @@
#
TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
TARGET_BOOTLOADER_BOARD_NAME := whitefin
-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_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)
+$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR))
TARGET_SCREEN_DENSITY := 440
USES_DEVICE_GOOGLE_RAVIOLE := true
diff --git a/whitefin_generic.mk b/whitefin_generic.mk
new file mode 100644
index 0000000..f0616c6
--- /dev/null
+++ b/whitefin_generic.mk
@@ -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/raviole/device-whitefin.mk)
+
+# preloaded_nanoapps.json
+PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/slider