[TMP] raviole: Use bka branch for vendors

raviole: Initialize for Evolution X 10.x
Signed-off-by: AnierinB <anierin@evolution-x.org>
2025-12-23 23:28:12 +01:00 · 2025-05-12 03:51:14 +00:00 · 2025-05-07 06:18:39 +03:00 · 2025-04-11 19:34:53 +03:00 · 2025-03-11 16:08:33 +02:00 · 2025-03-10 18:55:45 +02:00
129 changed files with 9025 additions and 1408 deletions
--- a/.gitupstream
+++ b/.gitupstream
@@ -0,0 +1 @@
+https://android.googlesource.com/device/google/raviole
--- a/Android.mk
+++ b/Android.mk
@@ -1,38 +0,0 @@
-#
-# Copyright (C) 2011 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.
-#
-
-# WARNING: Everything listed here will be built on ALL platforms,
-# including x86, the universal, and the SDK.  Modules must be uniquely
-# named (liblights.panda), and must build everywhere, or limit themselves
-# to only building on ARM if they include assembly. Individual makefiles
-# are responsible for having their own logic, for fine-grained control.
-
-$(eval $(call declare-copy-files-license-metadata,device/google/raviole,default-permissions.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
-$(eval $(call declare-copy-files-license-metadata,device/google/raviole,libnfc-nci-raven.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
-$(eval $(call declare-copy-files-license-metadata,device/google/raviole,libnfc-nci.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
-$(eval $(call declare-copy-files-license-metadata,device/google/raviole,fstab.postinstall,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
-$(eval $(call declare-copy-files-license-metadata,device/google/raviole,ueventd.rc,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
-$(eval $(call declare-copy-files-license-metadata,device/google/raviole,wpa_supplicant.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
-$(eval $(call declare-copy-files-license-metadata,device/google/raviole,hals.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
-$(eval $(call declare-copy-files-license-metadata,device/google/raviole,media_profiles_V1_0.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
-$(eval $(call declare-copy-files-license-metadata,device/google/raviole,media_codecs_performance.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
-$(eval $(call declare-copy-files-license-metadata,device/google/raviole,device_state_configuration.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
-$(eval $(call declare-copy-files-license-metadata,device/google/raviole,task_profiles.json,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
-$(eval $(call declare-copy-files-license-metadata,device/google/raviole,p2p_supplicant.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
-$(eval $(call declare-copy-files-license-metadata,device/google/raviole,wpa_supplicant.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
-$(eval $(call declare-copy-files-license-metadata,device/google/raviole,wpa_supplicant_overlay.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
-
-$(eval $(call declare-1p-copy-files,device/google/raviole,audio_policy_configuration.xml))
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -36,7 +36,9 @@ PRODUCT_MAKEFILES := \
    $(LOCAL_DIR)/aosp_whitefin_pkvm.mk \
    $(LOCAL_DIR)/aosp_whitefin_hwasan.mk \
    $(LOCAL_DIR)/aosp_whitefin_64.mk \
-    $(LOCAL_DIR)/factory_whitefin.mk
+    $(LOCAL_DIR)/factory_whitefin.mk \
+    $(LOCAL_DIR)/lineage_oriole.mk \
+    $(LOCAL_DIR)/lineage_raven.mk

 COMMON_LUNCH_CHOICES := \
    aosp_slider-trunk_staging-userdebug \
--- a/BoardConfigEvolution.mk
+++ b/BoardConfigEvolution.mk
@@ -0,0 +1,4 @@
+#
+# SPDX-FileCopyrightText: 2024 The Evolution X Project
+# SPDX-License-Identifier: Apache-2.0
+#
--- a/BoardConfigLineage.mk
+++ b/BoardConfigLineage.mk
@@ -0,0 +1,11 @@
+#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# SPDX-License-Identifier: Apache-2.0
+#
+
+# Kernel modules
+BOARD_VENDOR_RAMDISK_KERNEL_MODULES_BLOCKLIST_FILE := $(DEVICE_PATH)/modules.blocklist.vendor_boot
+BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_RAW := $(strip $(shell cat $(DEVICE_PATH)/modules.load.vendor_boot))
+BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD += $(BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_RAW)
+BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_RAW)))
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
 per-file powerhint-*.json = jychen@google.com,jenhaochen@google.com,wvw@google.com,joaodias@google.com

 # per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details.
-per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/OWNERS
+per-file *.mk,*/BoardConfig.mk,{**/,}Android.bp=file:device/google/gs-common:main:/MK_OWNERS
--- a/aosp_oriole.mk
+++ b/aosp_oriole.mk
@@ -23,4 +23,8 @@ PRODUCT_MODEL := AOSP on Oriole
 PRODUCT_BRAND := Android
 PRODUCT_MANUFACTURER := Google

-PRODUCT_PACKAGES += com.android.vndk.current.on_vendor
+# Keep the VNDK APEX in /system partition for REL branches as these branches are
+# expected to have stable API/ABI surfaces.
+ifneq (REL,$(PLATFORM_VERSION_CODENAME))
+  PRODUCT_PACKAGES += com.android.vndk.current.on_vendor
+endif
--- a/aosp_oriole_pgagnostic_64.mk
+++ b/aosp_oriole_pgagnostic_64.mk
@@ -19,4 +19,4 @@ PRODUCT_NAME := aosp_oriole_pgagnostic_64
 PRODUCT_MODEL := AOSP page size agnostic on Oriole 64-bit only

 PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
-PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536
+PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384
--- 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
@@ -26,4 +26,8 @@ PRODUCT_BRAND := Android
 PRODUCT_BRAND_FOR_ATTESTATION := google
 PRODUCT_MANUFACTURER := Google

-PRODUCT_PACKAGES += com.android.vndk.current.on_vendor
+# Keep the VNDK APEX in /system partition for REL branches as these branches are
+# expected to have stable API/ABI surfaces.
+ifneq (REL,$(PLATFORM_VERSION_CODENAME))
+  PRODUCT_PACKAGES += com.android.vndk.current.on_vendor
+endif
--- a/aosp_raven_pgagnostic_64.mk
+++ b/aosp_raven_pgagnostic_64.mk
@@ -19,4 +19,4 @@ PRODUCT_NAME := aosp_raven_pgagnostic_64
 PRODUCT_MODEL := AOSP page size agnostic on Raven 64-bit only

 PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
-PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536
+PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384
--- 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
--- 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
--- a/audio/oriole/audio-tables.mk
+++ b/audio/oriole/audio-tables.mk
@@ -53,7 +53,7 @@ PRODUCT_COPY_FILES += \
    device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/waves_preset.mps

 # userdebug specific
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_COPY_FILES += \
    device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/BLUETOOTH.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/BLUETOOTH.mods \
    device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSFREE.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSFREE.mods \
--- 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"
--- 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">
--- 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">
--- 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"
--- a/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
+++ b/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
@@ -11,6 +11,7 @@
                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
        </mixPort>
        <!-- Le Audio Audio Ports -->
+        <mixPort name="le audio broadcast output" role="source" />
        <mixPort name="le audio output" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                     samplingRates="44100 48000"
@@ -51,6 +52,7 @@
        <devicePort tagName="BLE Headset Out" type="AUDIO_DEVICE_OUT_BLE_HEADSET" role="sink"/>
        <devicePort tagName="BLE Speaker Out" type="AUDIO_DEVICE_OUT_BLE_SPEAKER" role="sink"/>
        <devicePort tagName="BLE Headset In" type="AUDIO_DEVICE_IN_BLE_HEADSET" role="source"/>
+        <devicePort tagName="BLE Broadcast Out" type="AUDIO_DEVICE_OUT_BLE_BROADCAST" role="sink"/>
    </devicePorts>
    <routes>
        <route type="mix" sink="BT A2DP Out"
@@ -66,6 +68,8 @@
        <route type="mix" sink="le audio input"
               sources="BLE Headset In"/>
        <route type="mix" sink="BLE Speaker Out"
-               sources="le audio output"/>
+            sources="le audio output"/>
+        <route type="mix" sink="BLE Broadcast Out"
+            sources="le audio broadcast output"/>
    </routes>
-</module>
+</module>
--- a/audio/oriole/tuning/waves/waves_config.ini
+++ b/audio/oriole/tuning/waves/waves_config.ini
@@ -29,7 +29,6 @@ OST_SPEAKER = 0:12,90:13,180:12,270:0|13
 SPEAKER_MUSIC = OM:1,SM:2,OST:OST_SPEAKER
 SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER
 SPEAKER_SAFE_CALL = OM:10,SM:2,OST:OST_SPEAKER
-HEADSET_MUSIC = OM:2,SM:2

 ########################################################################################################
 # This defines available CONTROL configurations. Only define the CONTROL if you need it.
@@ -38,8 +37,6 @@ HEADSET_MUSIC = OM:2,SM:2
 ########################################################################################################
 [HAL_SUPPORTED_CONTROLS]
 SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_SAFE_CALL
-A2DP_INSTANCE = INSTANCE:2,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC
-USB_HEADPHONE_INSTANCE = INSTANCE:4,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC

 [COEFS_CONVERTER_SETTING]
 AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so
--- a/audio/raven/audio-tables.mk
+++ b/audio/raven/audio-tables.mk
@@ -53,7 +53,7 @@ PRODUCT_COPY_FILES += \
    device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/waves_preset.mps

 # userdebug specific
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_COPY_FILES += \
    device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/BLUETOOTH.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/BLUETOOTH.mods \
    device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSFREE.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSFREE.mods \
--- 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"
--- 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">
--- 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">
--- 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"
--- a/audio/raven/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
+++ b/audio/raven/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
@@ -11,6 +11,7 @@
                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
        </mixPort>
        <!-- Le Audio Audio Ports -->
+        <mixPort name="le audio broadcast output" role="source" />
        <mixPort name="le audio output" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                     samplingRates="44100 48000"
@@ -51,6 +52,7 @@
        <devicePort tagName="BLE Headset Out" type="AUDIO_DEVICE_OUT_BLE_HEADSET" role="sink"/>
        <devicePort tagName="BLE Speaker Out" type="AUDIO_DEVICE_OUT_BLE_SPEAKER" role="sink"/>
        <devicePort tagName="BLE Headset In" type="AUDIO_DEVICE_IN_BLE_HEADSET" role="source"/>
+        <devicePort tagName="BLE Broadcast Out" type="AUDIO_DEVICE_OUT_BLE_BROADCAST" role="sink"/>
    </devicePorts>
    <routes>
        <route type="mix" sink="BT A2DP Out"
@@ -66,6 +68,8 @@
        <route type="mix" sink="le audio input"
               sources="BLE Headset In"/>
        <route type="mix" sink="BLE Speaker Out"
-               sources="le audio output"/>
+            sources="le audio output"/>
+        <route type="mix" sink="BLE Broadcast Out"
+            sources="le audio broadcast output"/>
    </routes>
-</module>
+</module>
--- a/audio/raven/tuning/waves/waves_config.ini
+++ b/audio/raven/tuning/waves/waves_config.ini
@@ -29,7 +29,6 @@ OST_SPEAKER = 0:12,90:13,180:12,270:0|13
 SPEAKER_MUSIC = OM:1,SM:2,OST:OST_SPEAKER
 SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER
 SPEAKER_SAFE_CALL = OM:10,SM:2,OST:OST_SPEAKER
-HEADSET_MUSIC = OM:2,SM:2

 ########################################################################################################
 # This defines available CONTROL configurations. Only define the CONTROL if you need it.
@@ -38,8 +37,6 @@ HEADSET_MUSIC = OM:2,SM:2
 ########################################################################################################
 [HAL_SUPPORTED_CONTROLS]
 SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_SAFE_CALL
-A2DP_INSTANCE = INSTANCE:2,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC
-USB_HEADPHONE_INSTANCE = INSTANCE:4,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC

 [COEFS_CONVERTER_SETTING]
 AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so
--- 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
--- a/conf/init.raviole.rc
+++ b/conf/init.raviole.rc
@@ -14,25 +14,25 @@ on early-boot
    start insmod_sh_raviole

 # Disables fingerprint antispoof on PROTO1.0 devices
-on boot && property:ro.build.type=userdebug && \
+on boot && property:ro.build.type=eng && \
           property:ro.revision=PROTO1.0 && \
           property:persist.vendor.fingerprint.disable.fake.override=none
    setprop vendor.fingerprint.disable.fake 100

 # Overrides fingerprint antispoof if following persist sysprops are set
-on boot && property:ro.build.type=userdebug && \
+on boot && property:ro.build.type=eng && \
           property:persist.vendor.fingerprint.disable.fake.override=0
    setprop vendor.fingerprint.disable.fake ${persist.vendor.fingerprint.disable.fake.override}

-on boot && property:ro.build.type=userdebug && \
+on boot && property:ro.build.type=eng && \
           property:persist.vendor.fingerprint.disable.fake.override=1
    setprop vendor.fingerprint.disable.fake ${persist.vendor.fingerprint.disable.fake.override}

-on boot && property:ro.build.type=userdebug && \
+on boot && property:ro.build.type=eng && \
           property:persist.vendor.fingerprint.disable.fake.override=100
    setprop vendor.fingerprint.disable.fake ${persist.vendor.fingerprint.disable.fake.override}

-service insmod_sh_raviole /vendor/bin/insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg
+service insmod_sh_raviole /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.${ro.hardware}.cfg
    class main
    user root
    group root system
--- a/conf/init.slider.rc
+++ b/conf/init.slider.rc
@@ -16,7 +16,7 @@ on early-boot
    start insmod_sh_slider


-service insmod_sh_slider /vendor/bin/insmod.sh /vendor/etc/init.insmod.slider.cfg
+service insmod_sh_slider /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.slider.cfg
    class main
    user root
    group root system
--- a/conf/init.whitefin.rc
+++ b/conf/init.whitefin.rc
@@ -14,7 +14,7 @@ on early-boot
    wait_for_prop vendor.common.modules.ready 1
    start insmod_sh_whitefin

-service insmod_sh_whitefin /vendor/bin/insmod.sh /vendor/etc/init.insmod.whitefin.cfg
+service insmod_sh_whitefin /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.whitefin.cfg
    class main
    user root
    group root system
--- a/device-evolution.mk
+++ b/device-evolution.mk
@@ -0,0 +1,7 @@
+#
+# Copyright (C) 2024 The Evolution X Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+# Overlays
+DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay-evolution
--- a/device-lineage.mk
+++ b/device-lineage.mk
@@ -0,0 +1,49 @@
+#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# SPDX-License-Identifier: Apache-2.0
+#
+
+DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/overlay-lineage
+
+# ANGLE - Almost Native Graphics Layer Engine
+PRODUCT_PACKAGES += \
+    ANGLE
+
+# EUICC
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.telephony.euicc.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/android.hardware.telephony.euicc.xml
+
+# IWLAN
+PRODUCT_PACKAGES += \
+    Iwlan
+
+# PowerShare
+include hardware/google/pixel/powershare/device.mk
+
+# wireless_charger HAL service
+include device/google/gs-common/wireless_charger/wireless_charger.mk
+
+# Build necessary packages for vendor
+
+# Codec2
+PRODUCT_PACKAGES += \
+    libexynosv4l2
+
+# Fingerprint
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml
+
+# GNSS
+PRODUCT_PACKAGES += \
+    android.hardware.sensors-V2-ndk.vendor:64
+
+# Graphics
+PRODUCT_PACKAGES += \
+    libEGL_angle \
+    libGLESv1_CM_angle \
+    libGLESv2_angle
+
+# Sensors
+PRODUCT_PACKAGES += \
+    sensors.dynamic_sensor_hal
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -17,17 +17,18 @@
 # 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)
+ifdef RELEASE_GOOGLE_ORIOLE_RADIO_DIR
+RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_ORIOLE_RADIO_DIR)
 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 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)
@@ -42,19 +43,11 @@ DEVICE_PACKAGE_OVERLAYS += device/google/raviole/oriole/overlay
 include device/google/raviole/audio/oriole/audio-tables.mk
 include device/google/gs101/device-shipping-common.mk
 include device/google/gs101/telephony/pktrouter.mk
-include hardware/google/pixel/vibrator/cs40l25/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/touch/stm/stm11.mk

 # 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)
@@ -76,9 +69,13 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
 	device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.oriole.rc

-# insmod files
+# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our
+# own copy if they're not in the prebuilts.
+# TODO(b/369686096): drop this when 5.10 is gone.
+ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),)
 PRODUCT_COPY_FILES += \
-	device/google/raviole/init.insmod.oriole.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.oriole.cfg
+	device/google/raviole/init.insmod.oriole.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.oriole.cfg
+endif

 # Thermal Config
 PRODUCT_COPY_FILES += \
@@ -92,7 +89,7 @@ PRODUCT_COPY_FILES += \
 	device/google/raviole/powerhint-oriole-mainline.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint-mainline.json \

 # Bluetooth sepolicy
-include device/google/gs101-sepolicy/oriole-sepolicy.mk
+include device/google/gs101/sepolicy/oriole-sepolicy.mk

 # Bluetooth
 PRODUCT_PRODUCT_PROPERTIES += \
@@ -110,12 +107,12 @@ PRODUCT_COPY_FILES += \


 # Bluetooth Hal Extension test tools
-PRODUCT_PACKAGES_DEBUG += \
+PRODUCT_PACKAGES_ENG += \
    sar_test \
    hci_inject

 # userdebug specific
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 # Bluetooth LE Audio Hardware offload
 PRODUCT_PRODUCT_PROPERTIES += \
    ro.bluetooth.leaudio_offload.supported=true \
@@ -162,6 +159,12 @@ PRODUCT_PACKAGES += \
 	android.hardware.nfc-service.st \
 	NfcOverlayOriole

+# Shared Modem Platform
+SHARED_MODEM_PLATFORM_VENDOR := lassen
+
+# Shared Modem Platform
+include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk
+
 # SecureElement
 PRODUCT_PACKAGES += \
 	android.hardware.secure_element@1.2-service-gto \
@@ -201,14 +204,40 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=1500
 PRODUCT_PROPERTY_OVERRIDES += ro.odm.build.media_performance_class=31

 # userdebug specific
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
    PRODUCT_COPY_FILES += \
        device/google/gs101/init.hardware.wlc.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.wlc.rc
 endif

 # Increment the SVN for any official public releases
+ifdef RELEASE_SVN_ORIOLE
+TARGET_SVN ?= $(RELEASE_SVN_ORIOLE)
+else
+# Set this for older releases that don't use build flag
+TARGET_SVN ?= 86
+endif
+
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=82
+    ro.vendor.build.svn=$(TARGET_SVN)
+
+# Set device family property for SMR builds
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.build.device_family=O6R4B9
+
+# Set build properties for SMR builds
+ifeq ($(RELEASE_IS_SMR), true)
+    ifneq (,$(RELEASE_BASE_OS_ORIOLE))
+        PRODUCT_BASE_OS := $(RELEASE_BASE_OS_ORIOLE)
+    endif
+endif
+
+# Set build properties for EMR builds
+ifeq ($(RELEASE_IS_EMR), true)
+    ifneq (,$(RELEASE_BASE_OS_ORIOLE))
+        PRODUCT_PROPERTY_OVERRIDES += \
+        ro.build.version.emergency_base_os=$(RELEASE_BASE_OS_ORIOLE)
+    endif
+endif

 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \
@@ -246,13 +275,6 @@ PRODUCT_PROPERTY_OVERRIDES += \

 # 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 += \
@@ -267,8 +289,8 @@ PRODUCT_PACKAGES += \
 	vendor.samsung_slsi.hardware.tetheroffload@1.1-service

 # Override default distortion output gain according to UX experiments
-PRODUCT_PRODUCT_PROPERTIES += \
-    vendor.audio.hapticgenerator.distortion.output.gain=0.5
+PRODUCT_VENDOR_PROPERTIES += \
+    vendor.audio.hapticgenerator.distortion.output.gain=0.32

 # RKPD
 PRODUCT_PRODUCT_PROPERTIES += \
@@ -301,12 +323,22 @@ PRODUCT_PRODUCT_PROPERTIES += \
    persist.bluetooth.opus.enabled=true

 # Location
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+    ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
        PRODUCT_COPY_FILES += \
-		device/google/raviole/location/gps.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+            device/google/raviole/location/gps.6.1.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    else
+        PRODUCT_COPY_FILES += \
+            device/google/raviole/location/gps.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    endif
 else
+    ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
        PRODUCT_COPY_FILES += \
-		device/google/raviole/location/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+            device/google/raviole/location/gps_user.6.1.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    else
+        PRODUCT_COPY_FILES += \
+            device/google/raviole/location/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    endif
 endif

 # Enable DeviceAsWebcam support
@@ -317,3 +349,23 @@ PRODUCT_VENDOR_PROPERTIES += \
 PRODUCT_PRODUCT_PROPERTIES += \
    ro.quick_start.oem_id=00e0 \
    ro.quick_start.device_id=oriole
+
+# Disable AVF Remote Attestation
+PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true
+
+# Bluetooth device id
+# Oriole: 0x4106
+PRODUCT_PRODUCT_PROPERTIES += \
+    bluetooth.device_id.product_id=16646
+
+# ETM
+ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
+endif
+endif
+
+# PlayVideos
+PLAYVIDEOS_VERSION_DIR := 4.20.6
+$(call soong_config_set_bool,playvideos,use_device_specific_version,true)
+PRODUCT_SOONG_NAMESPACES += vendor/unbundled_google/packages/PlayVideos/$(PLAYVIDEOS_VERSION_DIR)
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -17,17 +17,18 @@
 # 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)
+ifdef RELEASE_GOOGLE_RAVEN_RADIO_DIR
+RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RAVEN_RADIO_DIR)
 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 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 +49,6 @@ include device/google/gs-common/touch/lsi/lsi.mk

 # 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)
@@ -66,8 +60,6 @@ ifeq ($(filter factory_raven, $(TARGET_PRODUCT)),)
 include device/google/raviole/uwb/uwb_calibration.mk
 endif

-include hardware/google/pixel/vibrator/cs40l25/device.mk
-
 # go/lyric-soong-variables
 $(call soong_config_set,lyric,camera_hardware,raven)
 $(call soong_config_set,lyric,tuning_product,raven)
@@ -85,9 +77,13 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
 	device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.raven.rc

-# insmod files
+# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our
+# own copy if they're not in the prebuilts.
+# TODO(b/369686096): drop this when 5.10 is gone.
+ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),)
 PRODUCT_COPY_FILES += \
-	device/google/raviole/init.insmod.raven.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.raven.cfg
+	device/google/raviole/init.insmod.raven.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.raven.cfg
+endif

 # Thermal Config
 PRODUCT_COPY_FILES += \
@@ -103,7 +99,7 @@ PRODUCT_PACKAGES += \
      UwbOverlayR4

 # Bluetooth sepolicy
-include device/google/gs101-sepolicy/raven-sepolicy.mk
+include device/google/gs101/sepolicy/raven-sepolicy.mk

 # Bluetooth
 PRODUCT_PRODUCT_PROPERTIES += \
@@ -122,12 +118,12 @@ PRODUCT_COPY_FILES += \
 	device/google/raviole/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf

 # Bluetooth Hal Extension test tools
-PRODUCT_PACKAGES_DEBUG += \
+PRODUCT_PACKAGES_ENG += \
    sar_test \
    hci_inject

 # userdebug specific
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 # Bluetooth LE Audio Hardware offload
 PRODUCT_PRODUCT_PROPERTIES += \
    ro.bluetooth.leaudio_offload.supported=true \
@@ -168,6 +164,12 @@ PRODUCT_PACKAGES += \
 	android.hardware.nfc-service.st \
 	NfcOverlayRaven

+# Shared Modem Platform
+SHARED_MODEM_PLATFORM_VENDOR := lassen
+
+# Shared Modem Platform
+include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk
+
 # SecureElement
 PRODUCT_PACKAGES += \
 	android.hardware.secure_element@1.2-service-gto \
@@ -205,14 +207,40 @@ PRODUCT_SOONG_NAMESPACES += \


 # userdebug specific
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
    PRODUCT_COPY_FILES += \
        device/google/gs101/init.hardware.wlc.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.wlc.rc
 endif

 # Increment the SVN for any official public releases
+ifdef RELEASE_SVN_RAVEN
+TARGET_SVN ?= $(RELEASE_SVN_RAVEN)
+else
+# Set this for older releases that don't use build flag
+TARGET_SVN ?= 86
+endif
+
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=82
+    ro.vendor.build.svn=$(TARGET_SVN)
+
+# Set device family property for SMR
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.build.device_family=O6R4B9
+
+# Set build properties for SMR builds
+ifeq ($(RELEASE_IS_SMR), true)
+    ifneq (,$(RELEASE_BASE_OS_RAVEN))
+        PRODUCT_BASE_OS := $(RELEASE_BASE_OS_RAVEN)
+    endif
+endif
+
+# Set build properties for EMR builds
+ifeq ($(RELEASE_IS_EMR), true)
+    ifneq (,$(RELEASE_BASE_OS_RAVEN))
+        PRODUCT_PROPERTY_OVERRIDES += \
+        ro.build.version.emergency_base_os=$(RELEASE_BASE_OS_RAVEN)
+    endif
+endif

 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \
@@ -254,13 +282,6 @@ PRODUCT_PACKAGES += \

 # 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 += \
@@ -275,8 +296,8 @@ PRODUCT_PACKAGES += \
 	vendor.samsung_slsi.hardware.tetheroffload@1.1-service

 # Override default distortion output gain according to UX experiments
-PRODUCT_PRODUCT_PROPERTIES += \
-    vendor.audio.hapticgenerator.distortion.output.gain=0.5
+PRODUCT_VENDOR_PROPERTIES += \
+    vendor.audio.hapticgenerator.distortion.output.gain=0.32

 # RKPD
 PRODUCT_PRODUCT_PROPERTIES += \
@@ -312,12 +333,22 @@ PRODUCT_PRODUCT_PROPERTIES += \
    persist.bluetooth.opus.enabled=true

 # Location
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+    ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
        PRODUCT_COPY_FILES += \
-		device/google/raviole/location/gps.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+            device/google/raviole/location/gps.6.1.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    else
+        PRODUCT_COPY_FILES += \
+            device/google/raviole/location/gps.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    endif
 else
+    ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
        PRODUCT_COPY_FILES += \
-		device/google/raviole/location/gps_user.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+            device/google/raviole/location/gps_user.6.1.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    else
+        PRODUCT_COPY_FILES += \
+            device/google/raviole/location/gps_user.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+    endif
 endif

 # Enable DeviceAsWebcam support
@@ -327,3 +358,23 @@ PRODUCT_VENDOR_PROPERTIES += \
 PRODUCT_PRODUCT_PROPERTIES += \
    ro.quick_start.oem_id=00e0 \
    ro.quick_start.device_id=raven
+
+# Disable AVF Remote Attestation
+PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true
+
+# Bluetooth device id
+# Raven: 0x4107
+PRODUCT_PRODUCT_PROPERTIES += \
+    bluetooth.device_id.product_id=16647
+
+# ETM
+ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
+endif
+endif
+
+# PlayVideos
+PLAYVIDEOS_VERSION_DIR := 4.20.6
+$(call soong_config_set_bool,playvideos,use_device_specific_version,true)
+PRODUCT_SOONG_NAMESPACES += vendor/unbundled_google/packages/PlayVideos/$(PLAYVIDEOS_VERSION_DIR)
--- a/device-slider.mk
+++ b/device-slider.mk
@@ -14,8 +14,13 @@
 # limitations under the License.
 #

-TARGET_KERNEL_DIR ?= device/google/raviole-kernel
-TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
+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))
+
+# 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)
@@ -26,7 +31,6 @@ DEVICE_PACKAGE_OVERLAYS += device/google/raviole/slider/overlay

 include device/google/gs101/device-common.mk
 include device/google/raviole/audio/slider/audio-tables.mk
-include hardware/google/pixel/vibrator/cs40l25/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/gps/brcm/cbd_gps.mk
 include device/google/gs-common/touch/stm/stm11.mk
@@ -44,9 +48,13 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
 	device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.slider.rc

-# insmod files
+# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our
+# own copy if they're not in the prebuilts.
+# TODO(b/369686096): drop this when 5.10 is gone.
+ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),)
 PRODUCT_COPY_FILES += \
-	device/google/raviole/init.insmod.slider.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.slider.cfg
+	device/google/raviole/init.insmod.slider.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.slider.cfg
+endif

 # Thermal Config
 PRODUCT_COPY_FILES += \
@@ -87,6 +95,12 @@ PRODUCT_PACKAGES += \
 	Tag \
 	android.hardware.nfc-service.st

+# Shared Modem Platform
+SHARED_MODEM_PLATFORM_VENDOR := lassen
+
+# Shared Modem Platform
+include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk
+
 # SecureElement
 PRODUCT_PACKAGES += \
 	android.hardware.secure_element@1.2-service-gto
@@ -105,13 +119,6 @@ PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/slider

 # 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 += \
@@ -137,3 +144,5 @@ else
 		device/google/raviole/location/gps_user.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
 endif

+# Disable AVF Remote Attestation
+PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true
--- a/device-whitefin.mk
+++ b/device-whitefin.mk
@@ -14,8 +14,13 @@
 # limitations under the License.
 #

-TARGET_KERNEL_DIR ?= device/google/raviole-kernel
-TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
+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))
+
+# 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)
@@ -25,7 +30,6 @@ $(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/whit
 DEVICE_PACKAGE_OVERLAYS += device/google/raviole/whitefin/overlay

 include device/google/gs101/device-common.mk
-include hardware/google/pixel/vibrator/drv2624/device.mk
 include device/google/raviole/audio/whitefin/audio-tables.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/gps/brcm/cbd_gps.mk
@@ -48,9 +52,13 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
 	device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.whitefin.rc

-# insmod files
+# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our
+# own copy if they're not in the prebuilts.
+# TODO(b/369686096): drop this when 5.10 is gone.
+ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),)
 PRODUCT_COPY_FILES += \
-	device/google/raviole/init.insmod.whitefin.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.whitefin.cfg
+	device/google/raviole/init.insmod.whitefin.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.whitefin.cfg
+endif

 # Thermal Config
 PRODUCT_COPY_FILES += \
@@ -83,18 +91,17 @@ PRODUCT_PACKAGES += \
 	Tag \
 	android.hardware.nfc-service.st

+# Shared Modem Platform
+SHARED_MODEM_PLATFORM_VENDOR := lassen
+
+# Shared Modem Platform
+include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk
+
 # PowerStats HAL
 PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin

 # 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 += \
@@ -120,3 +127,5 @@ else
 		device/google/raviole/location/gps_user.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
 endif

+# Disable AVF Remote Attestation
+PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true
--- a/evolution.dependencies
+++ b/evolution.dependencies
@@ -0,0 +1,24 @@
+[
+  {
+    "repository": "device_google_gs101",
+    "target_path": "device/google/gs101"
+  },
+  {
+    "remote": "evo-tensor",
+    "repository": "device_google_raviole-kernels_evolution",
+    "target_path": "device/google/raviole-kernels/evolution",
+    "branch": "bka"
+  },
+  {
+    "remote": "evo-tensor",
+    "repository": "vendor_google_oriole",
+    "target_path": "vendor/google/oriole",
+    "branch": "bka"
+  },
+  {
+    "remote": "evo-tensor",
+    "repository": "vendor_google_raven",
+    "target_path": "vendor/google/raven",
+    "branch": "bka"
+  }
+]
--- a/factory_raven.mk
+++ b/factory_raven.mk
@@ -32,3 +32,6 @@ PRODUCT_PROPERTY_OVERRIDES += \

 # 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
--- a/factory_slider.mk
+++ b/factory_slider.mk
@@ -23,3 +23,6 @@ PRODUCT_DEVICE := slider
 PRODUCT_MODEL := Factory build on Slider
 PRODUCT_BRAND := Android
 PRODUCT_MANUFACTURER := Google
+
+# preloaded_nanoapps.json
+PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory
--- a/factory_whitefin.mk
+++ b/factory_whitefin.mk
@@ -29,3 +29,5 @@ PRODUCT_MANUFACTURER := Google
 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
--- a/lineage_oriole.mk
+++ b/lineage_oriole.mk
@@ -0,0 +1,35 @@
+#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# SPDX-License-Identifier: Apache-2.0
+#
+
+# Inherit some common Evolution X stuff
+TARGET_DISABLE_EPPE := true
+$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
+
+# Inherit device configuration
+DEVICE_CODENAME := oriole
+DEVICE_PATH := device/google/raviole
+VENDOR_PATH := vendor/google/oriole
+$(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk)
+$(call inherit-product, device/google/gs101/lineage_common.mk)
+$(call inherit-product, device/google/gs101/evolution_common.mk)
+$(call inherit-product, $(DEVICE_PATH)/$(DEVICE_CODENAME)/device-lineage.mk)
+$(call inherit-product, $(DEVICE_PATH)/$(DEVICE_CODENAME)/device-evolution.mk)
+
+# Device identifier. This must come after all inclusions
+PRODUCT_BRAND := google
+PRODUCT_MODEL := Pixel 6
+PRODUCT_NAME := lineage_$(DEVICE_CODENAME)
+
+# Boot animation
+TARGET_SCREEN_HEIGHT := 2400
+TARGET_SCREEN_WIDTH := 1080
+
+PRODUCT_BUILD_PROP_OVERRIDES += \
+    BuildDesc="oriole-user 15 BP1A.250505.005 13277524 release-keys" \
+    BuildFingerprint=google/oriole/oriole:15/BP1A.250505.005/13277524:user/release-keys \
+    DeviceProduct=$(DEVICE_CODENAME)
+
+$(call inherit-product, $(VENDOR_PATH)/$(DEVICE_CODENAME)-vendor.mk)
--- a/lineage_raven.mk
+++ b/lineage_raven.mk
@@ -0,0 +1,35 @@
+#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# SPDX-License-Identifier: Apache-2.0
+#
+
+# Inherit some common Evolution X stuff
+TARGET_DISABLE_EPPE := true
+$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
+
+# Inherit device configuration
+DEVICE_CODENAME := raven
+DEVICE_PATH := device/google/raviole
+VENDOR_PATH := vendor/google/raven
+$(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk)
+$(call inherit-product, device/google/gs101/lineage_common.mk)
+$(call inherit-product, device/google/gs101/evolution_common.mk)
+$(call inherit-product, $(DEVICE_PATH)/$(DEVICE_CODENAME)/device-lineage.mk)
+$(call inherit-product, $(DEVICE_PATH)/$(DEVICE_CODENAME)/device-evolution.mk)
+
+# Device identifier. This must come after all inclusions
+PRODUCT_BRAND := google
+PRODUCT_MODEL := Pixel 6 Pro
+PRODUCT_NAME := lineage_$(DEVICE_CODENAME)
+
+# Boot animation
+TARGET_SCREEN_HEIGHT := 3120
+TARGET_SCREEN_WIDTH := 1440
+
+PRODUCT_BUILD_PROP_OVERRIDES += \
+    BuildDesc="raven-user 15 BP1A.250505.005 13277524 release-keys" \
+    BuildFingerprint=google/raven/raven:15/BP1A.250505.005/13277524:user/release-keys \
+    DeviceProduct=$(DEVICE_CODENAME)
+
+$(call inherit-product, $(VENDOR_PATH)/$(DEVICE_CODENAME)-vendor.mk)
--- a/location/gps.6.1.xml.oriole
+++ b/location/gps.6.1.xml.oriole
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
+  <hal
+       PortName="/dev/ttyBCM"
+       BaudRate="921600"
+       GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
+       CustGpioDelayMs="250"
+       LogEnabled="true"
+       Log="JAVA"
+       SecondaryConfigPath="/data/vendor/gps/overlay/gps_overlay.xml"
+       LogDirectory="/sdcard/gps/broadcom/storage/"
+       CtrlPipe="/data/vendor/gps/glgpsctrl"
+       NmeaOutName="/data/vendor/gps/nmea_out"
+
+       acSuplServer="supl.google.com"
+       SuplPort="7275"
+       SuplLogEnable="true"
+       SuplLogFullName="/data/vendor/gps/suplflow.txt"
+       tlsEnable="true"
+
+       SuplSslMethod="SSLv23"
+       SuplEnable="true"
+       SuplUseApn="false"
+       SuplUseApnNI="true"
+       SuplDummyCellInfo="true"
+       SuplUseFwCellInfo="false"
+       SuplTlsCertDirPath="/etc/security/cacerts"
+       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
+       SuplUT1Seconds="20"
+       SuplUT2Seconds="20"
+       SuplUT3Seconds="20"
+       TcpConnectionTimeout="20"
+       SuplLppCapable="true"
+       SuplEcidCapable="true"
+       SuplVersion="2"
+       SuplMinorVersion="0"
+       SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
+       SuplGlonassCapable = "true"
+       SuplGalileoCapable = "true"
+       SuplBdsCapable = "true"
+       SuplMgpsCapable = "true"
+
+       RtoEnable="true"
+       RtiEnable="true"
+       HttpSyncLto="true"
+       LtoFileName="lto2.dat"
+       LtoDir="/data/vendor/gps/"
+       LtoSyncThresholdDays="1"
+
+       GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
+       CpGuardTimeSec="1"
+       CpLppGuardTimeSec="1"
+       IgnoreInjectedSystemTime="true"
+
+       AttributionAppPkgName="com.google.android.carrierlocation"
+
+       AssertEnabled="true"
+       ExitOnComFailure="true"
+       CpLppeCancelDbhOnAgnssProvideLoc="true"
+       CpLppeUseAgnssLocForEmptyDbh="true"
+       ReAidingOnHotStart="false"
+       ReAidingIntervalSec="3600"
+       PpsDevice="/sys/devices/platform/bbd_pps/pps_assert"
+       SensorsMask="0x244"
+       MaxThreadNum="13"
+  />
+
+  <gll
+       PpsEnable="true"
+       LogPriMask="LOG_INFO"
+       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"
+       RfType="GL_RF_4776_BRCM"
+       ExtL5Bias="9.3"
+       EnableFilteringForLTEB13="true"
+
+       WarmStandbyTimeout1Seconds="10"
+       WarmStandbyTimeout2Seconds="15"
+
+       EnableGnssPropagateInStandby="true"
+
+       RfPathLossDb_Ap="4.2"
+       RfPathLossDb_Cp="4.2"
+       RfPathLossDb_Ap_L5="4.1"
+       RfPathLossDb_Cp_L5="4.1"
+       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
+
+       EnableOnChipStopNotification="2"
+       PowerMode="3"
+       MinGpsWeekNumber="2216"
+       OnChipAccMask="50"
+       EnableB1C="false"
+
+       RTICacheTimeoutSec="3600"
+  />
+
+  <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
+       EnableNicAutoSwitch="true"
+       EnableNavic="true"
+  />
+
+</glgps>
+
--- a/location/gps.6.1.xml.raven
+++ b/location/gps.6.1.xml.raven
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
+  <hal
+       PortName="/dev/ttyBCM"
+       BaudRate="921600"
+       GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
+       CustGpioDelayMs="250"
+       LogEnabled="true"
+       Log="JAVA"
+       SecondaryConfigPath="/data/vendor/gps/overlay/gps_overlay.xml"
+       LogDirectory="/sdcard/gps/broadcom/storage/"
+       CtrlPipe="/data/vendor/gps/glgpsctrl"
+       NmeaOutName="/data/vendor/gps/nmea_out"
+
+       acSuplServer="supl.google.com"
+       SuplPort="7275"
+       SuplLogEnable="true"
+       SuplLogFullName="/data/vendor/gps/suplflow.txt"
+       tlsEnable="true"
+
+       SuplSslMethod="SSLv23"
+       SuplEnable="true"
+       SuplUseApn="false"
+       SuplUseApnNI="true"
+       SuplDummyCellInfo="true"
+       SuplUseFwCellInfo="false"
+       SuplTlsCertDirPath="/etc/security/cacerts"
+       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
+       SuplUT1Seconds="20"
+       SuplUT2Seconds="20"
+       SuplUT3Seconds="20"
+       TcpConnectionTimeout="20"
+       SuplLppCapable="true"
+       SuplEcidCapable="true"
+       SuplVersion="2"
+       SuplMinorVersion="0"
+       SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
+       SuplGlonassCapable = "true"
+       SuplGalileoCapable = "true"
+       SuplBdsCapable = "true"
+       SuplMgpsCapable = "true"
+
+       RtoEnable="true"
+       RtiEnable="true"
+       HttpSyncLto="true"
+       LtoFileName="lto2.dat"
+       LtoDir="/data/vendor/gps/"
+       LtoSyncThresholdDays="1"
+
+       GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
+       CpGuardTimeSec="1"
+       CpLppGuardTimeSec="1"
+       IgnoreInjectedSystemTime="true"
+
+       AttributionAppPkgName="com.google.android.carrierlocation"
+
+       AssertEnabled="true"
+       ExitOnComFailure="true"
+       CpLppeCancelDbhOnAgnssProvideLoc="true"
+       CpLppeUseAgnssLocForEmptyDbh="true"
+       ReAidingOnHotStart="false"
+       ReAidingIntervalSec="3600"
+       PpsDevice="/sys/devices/platform/bbd_pps/pps_assert"
+       SensorsMask="0x244"
+       MaxThreadNum="13"
+  />
+
+  <gll
+       PpsEnable="true"
+       LogPriMask="LOG_INFO"
+       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"
+       RfType="GL_RF_4776_BRCM"
+       ExtL5Bias="10.6"
+       EnableFilteringForLTEB13="true"
+
+       WarmStandbyTimeout1Seconds="10"
+       WarmStandbyTimeout2Seconds="15"
+
+       EnableGnssPropagateInStandby="true"
+
+       RfPathLossDb_Ap="4.1"
+       RfPathLossDb_Cp="4.1"
+       RfPathLossDb_Ap_L5="4"
+       RfPathLossDb_Cp_L5="4"
+       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
+
+       EnableOnChipStopNotification="2"
+       PowerMode="3"
+       MinGpsWeekNumber="2216"
+       OnChipAccMask="50"
+       EnableB1C="false"
+
+       RTICacheTimeoutSec="3600"
+  />
+
+  <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
+       EnableNicAutoSwitch="true"
+       EnableNavic="true"
+  />
+
+</glgps>
+
--- a/location/gps.xml
+++ b/location/gps.xml
@@ -18,7 +18,7 @@
       SuplLogFullName="/data/vendor/gps/suplflow.txt"
       tlsEnable="true"

-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
       SuplEnable="true"
       SuplUseApn="false"
       SuplUseApnNI="true"
@@ -35,7 +35,7 @@
       SuplVersion="2"
       SuplMinorVersion="0"
       SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="false"
+       SuplOtdoaCapable2="true"
       SuplGlonassCapable = "true"
       SuplGalileoCapable = "true"
       SuplBdsCapable = "true"
@@ -49,6 +49,7 @@
       LtoSyncThresholdDays="1"

       GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
       CpGuardTimeSec="1"
       CpLppGuardTimeSec="1"
       IgnoreInjectedSystemTime="true"
@@ -56,6 +57,7 @@
       AttributionAppPkgName="com.google.android.carrierlocation"

       AssertEnabled="true"
+       ExitOnComFailure="true"
       CpLppeCancelDbhOnAgnssProvideLoc="true"
       CpLppeUseAgnssLocForEmptyDbh="true"
       ReAidingOnHotStart="false"
@@ -68,7 +70,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"
@@ -97,6 +99,8 @@
  />

  <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
       EnableNicAutoSwitch="true"
       EnableNavic="true"
  />
--- a/location/gps.xml.oriole
+++ b/location/gps.xml.oriole
@@ -18,7 +18,7 @@
       SuplLogFullName="/data/vendor/gps/suplflow.txt"
       tlsEnable="true"

-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
       SuplEnable="true"
       SuplUseApn="false"
       SuplUseApnNI="true"
@@ -35,7 +35,7 @@
       SuplVersion="2"
       SuplMinorVersion="0"
       SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="false"
+       SuplOtdoaCapable2="true"
       SuplGlonassCapable = "true"
       SuplGalileoCapable = "true"
       SuplBdsCapable = "true"
@@ -49,6 +49,7 @@
       LtoSyncThresholdDays="1"

       GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
       CpGuardTimeSec="1"
       CpLppGuardTimeSec="1"
       IgnoreInjectedSystemTime="true"
@@ -56,6 +57,7 @@
       AttributionAppPkgName="com.google.android.carrierlocation"

       AssertEnabled="true"
+       ExitOnComFailure="true"
       CpLppeCancelDbhOnAgnssProvideLoc="true"
       CpLppeUseAgnssLocForEmptyDbh="true"
       ReAidingOnHotStart="false"
@@ -68,7 +70,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"
@@ -97,8 +99,11 @@
  />

  <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
       EnableNicAutoSwitch="true"
       EnableNavic="true"
+       ConstellationAutoSwitchOffNavOnly="true"
  />

 </glgps>
--- a/location/gps.xml.raven
+++ b/location/gps.xml.raven
@@ -18,7 +18,7 @@
       SuplLogFullName="/data/vendor/gps/suplflow.txt"
       tlsEnable="true"

-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
       SuplEnable="true"
       SuplUseApn="false"
       SuplUseApnNI="true"
@@ -35,7 +35,7 @@
       SuplVersion="2"
       SuplMinorVersion="0"
       SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="false"
+       SuplOtdoaCapable2="true"
       SuplGlonassCapable = "true"
       SuplGalileoCapable = "true"
       SuplBdsCapable = "true"
@@ -49,6 +49,7 @@
       LtoSyncThresholdDays="1"

       GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
       CpGuardTimeSec="1"
       CpLppGuardTimeSec="1"
       IgnoreInjectedSystemTime="true"
@@ -56,6 +57,7 @@
       AttributionAppPkgName="com.google.android.carrierlocation"

       AssertEnabled="true"
+       ExitOnComFailure="true"
       CpLppeCancelDbhOnAgnssProvideLoc="true"
       CpLppeUseAgnssLocForEmptyDbh="true"
       ReAidingOnHotStart="false"
@@ -68,7 +70,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"
@@ -97,8 +99,11 @@
  />

  <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
       EnableNicAutoSwitch="true"
       EnableNavic="true"
+       ConstellationAutoSwitchOffNavOnly="true"
  />

 </glgps>
--- a/location/gps_user.6.1.xml.oriole
+++ b/location/gps_user.6.1.xml.oriole
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
+  <hal
+       PortName="/dev/ttyBCM"
+       BaudRate="921600"
+       GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
+       CustGpioDelayMs="250"
+       LogEnabled="false"
+       Log="JAVA"
+       LogDirectory="/sdcard/gps/broadcom/storage/"
+       CtrlPipe="/data/vendor/gps/glgpsctrl"
+       NmeaOutName="/data/vendor/gps/nmea_out"
+
+       acSuplServer="supl.google.com"
+       SuplPort="7275"
+       SuplLogEnable="false"
+       SuplLogFullName="/data/vendor/gps/suplflow.txt"
+       tlsEnable="true"
+
+       SuplSslMethod="SSLv23"
+       SuplEnable="true"
+       SuplUseApn="false"
+       SuplUseApnNI="true"
+       SuplDummyCellInfo="true"
+       SuplUseFwCellInfo="false"
+       SuplTlsCertDirPath="/etc/security/cacerts"
+       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
+       SuplUT1Seconds="20"
+       SuplUT2Seconds="20"
+       SuplUT3Seconds="20"
+       TcpConnectionTimeout="20"
+       SuplLppCapable="true"
+       SuplEcidCapable="true"
+       SuplVersion="2"
+       SuplMinorVersion="0"
+       SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
+       SuplGlonassCapable = "true"
+       SuplGalileoCapable = "true"
+       SuplBdsCapable = "true"
+       SuplMgpsCapable = "true"
+
+       RtoEnable="true"
+       RtiEnable="true"
+       HttpSyncLto="true"
+       LtoFileName="lto2.dat"
+       LtoDir="/data/vendor/gps/"
+       LtoSyncThresholdDays="1"
+
+       GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
+       CpGuardTimeSec="1"
+       CpLppGuardTimeSec="1"
+       IgnoreInjectedSystemTime="true"
+
+       AttributionAppPkgName="com.google.android.carrierlocation"
+
+       AssertEnabled="false"
+       CpLppeCancelDbhOnAgnssProvideLoc="true"
+       CpLppeUseAgnssLocForEmptyDbh="true"
+       ReAidingOnHotStart="false"
+       ReAidingIntervalSec="3600"
+       PpsDevice="/sys/devices/platform/bbd_pps/pps_assert"
+       SensorsMask="0x244"
+       MaxThreadNum="13"
+  />
+
+  <gll
+       PpsEnable="true"
+       LogPriMask="LOG_INFO"
+       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"
+       RfType="GL_RF_4776_BRCM"
+       ExtL5Bias="9.3"
+       EnableFilteringForLTEB13="true"
+
+       WarmStandbyTimeout1Seconds="10"
+       WarmStandbyTimeout2Seconds="15"
+
+       EnableGnssPropagateInStandby="true"
+
+       RfPathLossDb_Ap="4.2"
+       RfPathLossDb_Cp="4.2"
+       RfPathLossDb_Ap_L5="4.1"
+       RfPathLossDb_Cp_L5="4.1"
+       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
+
+       EnableOnChipStopNotification="false"
+       PowerMode="3"
+       MinGpsWeekNumber="2216"
+       OnChipAccMask="50"
+       EnableB1C="false"
+
+       RTICacheTimeoutSec="3600"
+  />
+
+  <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
+       EnableNicAutoSwitch="true"
+       EnableNavic="true"
+  />
+
+</glgps>
+
--- a/location/gps_user.6.1.xml.raven
+++ b/location/gps_user.6.1.xml.raven
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
+  <hal
+       PortName="/dev/ttyBCM"
+       BaudRate="921600"
+       GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
+       CustGpioDelayMs="250"
+       LogEnabled="false"
+       Log="JAVA"
+       LogDirectory="/sdcard/gps/broadcom/storage/"
+       CtrlPipe="/data/vendor/gps/glgpsctrl"
+       NmeaOutName="/data/vendor/gps/nmea_out"
+
+       acSuplServer="supl.google.com"
+       SuplPort="7275"
+       SuplLogEnable="false"
+       SuplLogFullName="/data/vendor/gps/suplflow.txt"
+       tlsEnable="true"
+
+       SuplSslMethod="SSLv23"
+       SuplEnable="true"
+       SuplUseApn="false"
+       SuplUseApnNI="true"
+       SuplDummyCellInfo="true"
+       SuplUseFwCellInfo="false"
+       SuplTlsCertDirPath="/etc/security/cacerts"
+       SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
+       SuplUT1Seconds="20"
+       SuplUT2Seconds="20"
+       SuplUT3Seconds="20"
+       TcpConnectionTimeout="20"
+       SuplLppCapable="true"
+       SuplEcidCapable="true"
+       SuplVersion="2"
+       SuplMinorVersion="0"
+       SuplOtdoaCapable="true"
+       SuplOtdoaCapable2="true"
+       SuplGlonassCapable = "true"
+       SuplGalileoCapable = "true"
+       SuplBdsCapable = "true"
+       SuplMgpsCapable = "true"
+
+       RtoEnable="true"
+       RtiEnable="true"
+       HttpSyncLto="true"
+       LtoFileName="lto2.dat"
+       LtoDir="/data/vendor/gps/"
+       LtoSyncThresholdDays="1"
+
+       GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
+       CpGuardTimeSec="1"
+       CpLppGuardTimeSec="1"
+       IgnoreInjectedSystemTime="true"
+
+       AttributionAppPkgName="com.google.android.carrierlocation"
+
+       AssertEnabled="false"
+       CpLppeCancelDbhOnAgnssProvideLoc="true"
+       CpLppeUseAgnssLocForEmptyDbh="true"
+       ReAidingOnHotStart="false"
+       ReAidingIntervalSec="3600"
+       PpsDevice="/sys/devices/platform/bbd_pps/pps_assert"
+       SensorsMask="0x244"
+       MaxThreadNum="13"
+  />
+
+  <gll
+       PpsEnable="true"
+       LogPriMask="LOG_INFO"
+       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"
+       RfType="GL_RF_4776_BRCM"
+       ExtL5Bias="10.6"
+       EnableFilteringForLTEB13="true"
+
+       WarmStandbyTimeout1Seconds="10"
+       WarmStandbyTimeout2Seconds="15"
+
+       EnableGnssPropagateInStandby="true"
+
+       RfPathLossDb_Ap="4.1"
+       RfPathLossDb_Cp="4.1"
+       RfPathLossDb_Ap_L5="4"
+       RfPathLossDb_Cp_L5="4"
+       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
+
+       EnableOnChipStopNotification="false"
+       PowerMode="3"
+       MinGpsWeekNumber="2216"
+       OnChipAccMask="50"
+       EnableB1C="false"
+
+       RTICacheTimeoutSec="3600"
+  />
+
+  <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
+       EnableNicAutoSwitch="true"
+       EnableNavic="true"
+  />
+
+</glgps>
+
--- a/location/gps_user.xml
+++ b/location/gps_user.xml
@@ -17,7 +17,7 @@
       SuplLogFullName="/data/vendor/gps/suplflow.txt"
       tlsEnable="true"

-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
       SuplEnable="true"
       SuplUseApn="false"
       SuplUseApnNI="true"
@@ -34,7 +34,7 @@
       SuplVersion="2"
       SuplMinorVersion="0"
       SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="false"
+       SuplOtdoaCapable2="true"
       SuplGlonassCapable = "true"
       SuplGalileoCapable = "true"
       SuplBdsCapable = "true"
@@ -48,6 +48,7 @@
       LtoSyncThresholdDays="1"

       GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
       CpGuardTimeSec="1"
       CpLppGuardTimeSec="1"
       IgnoreInjectedSystemTime="true"
@@ -96,6 +97,8 @@
  />

  <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
       EnableNicAutoSwitch="true"
       EnableNavic="true"
  />
--- a/location/gps_user.xml.oriole
+++ b/location/gps_user.xml.oriole
@@ -17,7 +17,7 @@
       SuplLogFullName="/data/vendor/gps/suplflow.txt"
       tlsEnable="true"

-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
       SuplEnable="true"
       SuplUseApn="false"
       SuplUseApnNI="true"
@@ -34,7 +34,7 @@
       SuplVersion="2"
       SuplMinorVersion="0"
       SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="false"
+       SuplOtdoaCapable2="true"
       SuplGlonassCapable = "true"
       SuplGalileoCapable = "true"
       SuplBdsCapable = "true"
@@ -48,6 +48,7 @@
       LtoSyncThresholdDays="1"

       GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
       CpGuardTimeSec="1"
       CpLppGuardTimeSec="1"
       IgnoreInjectedSystemTime="true"
@@ -96,8 +97,11 @@
  />

  <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
       EnableNicAutoSwitch="true"
       EnableNavic="true"
+       ConstellationAutoSwitchOffNavOnly="true"
  />

 </glgps>
--- a/location/gps_user.xml.raven
+++ b/location/gps_user.xml.raven
@@ -17,7 +17,7 @@
       SuplLogFullName="/data/vendor/gps/suplflow.txt"
       tlsEnable="true"

-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
       SuplEnable="true"
       SuplUseApn="false"
       SuplUseApnNI="true"
@@ -34,7 +34,7 @@
       SuplVersion="2"
       SuplMinorVersion="0"
       SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="false"
+       SuplOtdoaCapable2="true"
       SuplGlonassCapable = "true"
       SuplGalileoCapable = "true"
       SuplBdsCapable = "true"
@@ -48,6 +48,7 @@
       LtoSyncThresholdDays="1"

       GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
       CpGuardTimeSec="1"
       CpLppGuardTimeSec="1"
       IgnoreInjectedSystemTime="true"
@@ -96,8 +97,11 @@
  />

  <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
       EnableNicAutoSwitch="true"
       EnableNavic="true"
+       ConstellationAutoSwitchOffNavOnly="true"
  />

 </glgps>
--- a/modules.blocklist.vendor_boot
+++ b/modules.blocklist.vendor_boot
@@ -0,0 +1,2 @@
+blocklist ftm5
+blocklist sec_touch
--- a/modules.load.vendor_boot
+++ b/modules.load.vendor_boot
@@ -0,0 +1,2 @@
+extra/ftm5.ko
+extra/sec_touch.ko
--- a/oriole/Android.bp
+++ b/oriole/Android.bp
@@ -0,0 +1,11 @@
+//
+// SPDX-FileCopyrightText: 2024 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+prebuilt_etc {
+    name: "init.recovery.oriole.touch.rc",
+    src: "init.recovery.touch.rc",
+    sub_dir: "init",
+    recovery: true,
+}
--- a/oriole/BoardConfig.mk
+++ b/oriole/BoardConfig.mk
@@ -18,20 +18,12 @@
 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
-
 ifdef AUTOMOTIVE_PRODUCT_PATH
  #RBC# include_top device/google/auto_tcu
  #RBC# include_top device/google/pixel_tcu
@@ -47,7 +39,19 @@ USES_DEVICE_GOOGLE_RAVIOLE := true
 BOARD_KERNEL_CMDLINE += disable_dma32=on

 include device/google/gs101/BoardConfig-common.mk
-include device/google/gs101-sepolicy/oriole-sepolicy.mk
+include device/google/gs101/sepolicy/oriole-sepolicy.mk
 include device/google/gs101/wifi/BoardConfig-wifi.mk
 -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 -include vendor/google_devices/oriole/proprietary/BoardConfigVendor.mk
+
+ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+-include device/google/common/etm/BoardUserdebugModules.mk
+endif
+endif
+
+DEVICE_PATH := device/google/raviole
+VENDOR_PATH := vendor/google/oriole
+include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk
+include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigEvolution.mk
--- a/oriole/BoardConfigEvolution.mk
+++ b/oriole/BoardConfigEvolution.mk
@@ -0,0 +1,6 @@
+#
+# SPDX-FileCopyrightText: 2024 The Evolution X Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+include $(DEVICE_PATH)/BoardConfigEvolution.mk
--- a/oriole/BoardConfigLineage.mk
+++ b/oriole/BoardConfigLineage.mk
@@ -0,0 +1,9 @@
+#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# SPDX-License-Identifier: Apache-2.0
+#
+
+include $(DEVICE_PATH)/BoardConfigLineage.mk
+
+include $(VENDOR_PATH)/BoardConfigVendor.mk
--- a/oriole/device-evolution.mk
+++ b/oriole/device-evolution.mk
@@ -0,0 +1,8 @@
+#
+# SPDX-FileCopyrightText: 2024 The Evolution X Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+$(call inherit-product, $(DEVICE_PATH)/device-evolution.mk)
+
+DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/$(DEVICE_CODENAME)/overlay-evolution
--- a/oriole/device-lineage.mk
+++ b/oriole/device-lineage.mk
@@ -0,0 +1,17 @@
+#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# SPDX-License-Identifier: Apache-2.0
+#
+
+$(call inherit-product, $(DEVICE_PATH)/device-lineage.mk)
+
+DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/$(DEVICE_CODENAME)/overlay-lineage
+
+# HBM
+PRODUCT_PACKAGES += \
+    HbmSVManagerOverlay
+
+# Init
+PRODUCT_PACKAGES += \
+    init.recovery.oriole.touch.rc
--- a/oriole/extract-files.py
+++ b/oriole/extract-files.py
@@ -0,0 +1,107 @@
+#!/usr/bin/env -S PYTHONPATH=../../../../tools/extract-utils python3
+#
+# SPDX-FileCopyrightText: 2024 The LineageOS Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+from extract_utils.extract import extract_fns_user_type
+from extract_utils.extract_pixel import (
+    extract_pixel_factory_image,
+    extract_pixel_firmware,
+    pixel_factory_image_regex,
+    pixel_firmware_regex,
+)
+from extract_utils.file import FileArgs, FileList
+from extract_utils.fixups_blob import (
+    blob_fixup,
+    blob_fixups_user_type,
+)
+from extract_utils.fixups_lib import (
+    lib_fixup_remove,
+    lib_fixups,
+    lib_fixups_user_type,
+)
+from extract_utils.main import (
+    ExtractUtils,
+    ExtractUtilsModule,
+)
+
+namespace_imports = [
+    'device/google/raviole',
+    'hardware/google/av',
+    'hardware/google/gchips',
+    'hardware/google/graphics/common',
+    'hardware/google/interfaces',
+    'hardware/google/pixel',
+]
+
+
+def lib_fixup_vendor_suffix(lib: str, partition: str, *args, **kwargs):
+    return f'{lib}_{partition}' if partition == 'vendor' else None
+
+
+lib_fixups: lib_fixups_user_type = {
+    **lib_fixups,
+    (
+        'com.google.edgetpu_app_service-V3-ndk',
+        'com.google.edgetpu_vendor_service-V2-ndk',
+    ): lib_fixup_vendor_suffix,
+    'android.hardware.sensors-V2-ndk': lib_fixup_remove,
+}
+
+blob_fixups: blob_fixups_user_type = {
+    'product/etc/felica/common.cfg': blob_fixup()
+        .patch_file('osaifu-keitai.patch'),
+    'vendor/etc/init/init.modem_logging_control.rc': blob_fixup()
+        .regex_replace(' && property:ro.debuggable=0', ''),
+}  # fmt: skip
+
+extract_fns: extract_fns_user_type = {
+    pixel_factory_image_regex: extract_pixel_factory_image,
+    pixel_firmware_regex: extract_pixel_firmware,
+}
+
+module = ExtractUtilsModule(
+    'oriole',
+    'google',
+    device_rel_path='device/google/raviole/oriole',
+    blob_fixups=blob_fixups,
+    lib_fixups=lib_fixups,
+    namespace_imports=namespace_imports,
+    add_generated_carriersettings_file=True,
+    add_firmware_proprietary_file=True,
+    extract_fns=extract_fns,
+)
+
+
+def fix_vendor_file_list(file_list: FileList):
+    # flp.default & gps.default have incorrect SONAME
+    # gpsd depends on android.hardware.sensors-V2-ndk & android.hardware.sensors-V3-ndk
+    disable_checkelf_file_paths = [
+        'vendor/bin/hw/gpsd',
+        'vendor/lib64/hw/flp.default.so',
+        'vendor/lib64/hw/gps.default.so',
+    ]
+    for file_path in disable_checkelf_file_paths:
+        file_list.get_file(file_path).set_arg(FileArgs.DISABLE_CHECKELF, True)
+
+    module_suffix_file_paths = [
+        'vendor/lib/com.google.edgetpu_app_service-V3-ndk.so',
+        'vendor/lib64/com.google.edgetpu_app_service-V3-ndk.so',
+        'vendor/lib64/com.google.edgetpu_vendor_service-V2-ndk.so',
+    ]
+
+    for file_path in module_suffix_file_paths:
+        file_list.get_file(file_path).set_arg(FileArgs.MODULE_SUFFIX, '_vendor')
+
+
+module.add_generated_proprietary_file(
+    'proprietary-files-vendor.txt',
+    partition='vendor',
+    skip_file_list_name='skip-files-vendor.txt',
+    fix_file_list=fix_vendor_file_list,
+)
+
+if __name__ == '__main__':
+    utils = ExtractUtils.device(module)
+    utils.run()
--- a/oriole/init.recovery.touch.rc
+++ b/oriole/init.recovery.touch.rc
@@ -0,0 +1,2 @@
+on init
+   insmod /lib/modules/ftm5.ko
--- a/oriole/osaifu-keitai.patch
+++ b/oriole/osaifu-keitai.patch
@@ -0,0 +1,24 @@
+From aab255f2807cfc460c0dce40decd5554d49c0076 Mon Sep 17 00:00:00 2001
+From: jabashque <jabashque@gmail.com>
+Date: Mon, 5 Feb 2024 21:36:03 +0000
+Subject: [PATCH 1/1] Enable Osaifu-Keitai on non-Japanese SKUs
+
+---
+ common.cfg | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/common.cfg b/common.cfg
+index 3b78765..00f53cb 100644
+--- a/common.cfg
+++ b/common.cfg
+@@ -11,6 +11,5 @@
+ 02030001,0
+ 02030002,0
+ 02030003,intent:#Intent;action=android.settings.NFC_SETTINGS;end
+-00000014,content://com.google.android.pixelnfc.provider.DeviceInfoContentProvider/isJapanSku
+-00000015,is_japan_sku
+ 00000016,0001
+00000018,1
+-- 
+2.47.0
+
--- a/oriole/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml
+++ b/oriole/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2019-2024 The Evolution X Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- Android version screen, build maintainer -->
+    <string name="build_maintainer_summary" translatable="false">Anierin Bliss</string>
+    <string name="build_maintainer_donate_url" translatable="false">https://PayPal.me/AnierinB</string>
+</resources>
--- a/oriole/overlay-lineage/packages/apps/Aperture/app/src/main/res/values/config.xml
+++ b/oriole/overlay-lineage/packages/apps/Aperture/app/src/main/res/values/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2022 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <!-- An array of triplets made of (camera ID, approximate zoom ratio, exact zoom ratio).
+         These values will be added to the lens selector if one or more cameras uses the
+         multi-camera API to let the user select which lens to use.
+         It's highly recommended to leave config_enableAuxCameras to false, since with
+         multi-camera API you only use a single camera device for all sensors.
+         You may enable it if you need auxiliary camera devices for a set of cameras on one
+         of the device's side (e.g. logical main back camera but multiple physical camera
+         devices on front), in that case if a main device side's lens is referenced here
+         all the auxiliary camera devices of that side will be ignored.
+         You may be able to get the exact zoom ratio needed to trigger the lens switch from
+         your stock camera app and observing the zoom ratio it sets with the following command:
+         adb shell dumpsys media.camera | grep 'android.control.zoomRatio' -1
+         Example for Google Pixel 7 Pro's back camera configuration:
+             <string-array name="config_logicalZoomRatios">
+                 <item>0</item> <item>0.5</item> <item>0.55632502</item>
+                 <item>0</item> <item>2.0</item> <item>2.0</item>
+                 <item>0</item> <item>5.0</item> <item>5.0</item>
+             </string-array>
+    -->
+    <string-array name="config_logicalZoomRatios">
+        <item>0</item> <item>0.7</item> <item>0.67044300</item>
+        <item>0</item> <item>2.0</item> <item>2.0</item>
+    </string-array>
+</resources>
--- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
@@ -93,9 +93,9 @@
    <!-- Height of the status bar.
         Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
         -->
-    <dimen name="status_bar_height_height_default">74px</dimen>
+    <dimen name="status_bar_height_default">28dp</dimen>
    <dimen name="status_bar_height_portrait">128px</dimen>
-    <dimen name="status_bar_height_landscape">74px</dimen>
+    <dimen name="status_bar_height_landscape">28dp</dimen>

    <!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
    <dimen name="rounded_corner_radius_adjustment">5px</dimen>
--- a/oriole/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ b/oriole/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -16,7 +16,7 @@
 */
 -->
 <resources>
-   <!-- for 20dp of padding at 3.5px/dp at default density -->
-    <dimen name="rounded_corner_content_padding">50px</dimen>
+    <!-- Default paddings for content around the corners. -->
+    <dimen name="rounded_corner_content_padding">14dp</dimen>
 </resources>

--- a/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -16,24 +16,20 @@
 */
 -->
 <resources>
-    <!-- Don't need the left side padding due to being inset from the cutout -->
+    <!-- the padding on the start of the statusbar -->
    <dimen name="status_bar_padding_start">0dp</dimen>

    <!-- the padding on the top of the statusbar (usually 0) -->
    <dimen name="status_bar_padding_top">1px</dimen>

    <!-- Height of the status bar header bar when on Keyguard (match status_bar_height) -->
-    <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height</dimen>
+    <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height_default</dimen>

-    <!-- Padding for the system icons on the keyguard (when no multi user switch is showing).
-    The icons always have a 4dp padding in the container so we only need 26 extra px of padding
-    for the corners -->
-    <dimen name="system_icons_super_container_avatarless_margin_end">26px</dimen>
+    <!-- Margin on the left side of the carrier text on Keyguard -->
+    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>

-    <!-- Margin on the right side of the system icon group on Keyguard. -->
-    <dimen name="system_icons_keyguard_padding_end">4.5dp</dimen>
-
-    <dimen name="keyguard_carrier_text_margin">0px</dimen>
+    <!--  Total minimum padding to enforce to ensure that the dot can always show  -->
+    <dimen name="ongoing_appops_dot_min_padding">14dp</dimen>

    <dimen name="config_rounded_mask_size">71px</dimen>
    <dimen name="config_rounded_mask_size_top">71px</dimen>
@@ -46,7 +42,6 @@
    <dimen name="physical_volume_up_button_center_screen_location_y">950px</dimen>
    <dimen name="physical_volume_down_button_center_screen_location_y">1110px</dimen>

-
    <!-- Padding for the lock icon on the keyguard. In pixels - should not scale with display size. -->
    <dimen name="lock_icon_padding">54px</dimen>

--- a/oriole/proprietary-files-carriersettings.txt
+++ b/oriole/proprietary-files-carriersettings.txt
@@ -0,0 +1,428 @@
+# All blobs below are extracted from the release mentioned in proprietary-files.txt
+product/etc/CarrierSettings/1and1_de.pb
+product/etc/CarrierSettings/2degrees_nz.pb
+product/etc/CarrierSettings/321communications_us.pb
+product/etc/CarrierSettings/48_ie.pb
+product/etc/CarrierSettings/4ka_sk.pb
+product/etc/CarrierSettings/a1_at.pb
+product/etc/CarrierSettings/a1_bg.pb
+product/etc/CarrierSettings/a1_hr.pb
+product/etc/CarrierSettings/a1_mk.pb
+product/etc/CarrierSettings/a1_si.pb
+product/etc/CarrierSettings/ahamo_jp.pb
+product/etc/CarrierSettings/airbus_de.pb
+product/etc/CarrierSettings/airbus_fr.pb
+product/etc/CarrierSettings/airtel_in.pb
+product/etc/CarrierSettings/ais_th.pb
+product/etc/CarrierSettings/alcom_fi.pb
+product/etc/CarrierSettings/altice_us.pb
+product/etc/CarrierSettings/alticeroaming_us.pb
+product/etc/CarrierSettings/andorratelecom_ad.pb
+product/etc/CarrierSettings/antel_uy.pb
+product/etc/CarrierSettings/appalachian_us.pb
+product/etc/CarrierSettings/apt_tw.pb
+product/etc/CarrierSettings/asda_gb.pb
+product/etc/CarrierSettings/assurance_us.pb
+product/etc/CarrierSettings/astca_as.pb
+product/etc/CarrierSettings/astoundbroadband_us.pb
+product/etc/CarrierSettings/att5g_us.pb
+product/etc/CarrierSettings/att5gsa_us.pb
+product/etc/CarrierSettings/att_mx.pb
+product/etc/CarrierSettings/att_us.pb
+product/etc/CarrierSettings/attbootstrap_us.pb
+product/etc/CarrierSettings/attmvnos_us.pb
+product/etc/CarrierSettings/axis_id.pb
+product/etc/CarrierSettings/base_be.pb
+product/etc/CarrierSettings/batelco_bh.pb
+product/etc/CarrierSettings/bell_ca.pb
+product/etc/CarrierSettings/bite_lt.pb
+product/etc/CarrierSettings/bite_lv.pb
+product/etc/CarrierSettings/bluegrass_us.pb
+product/etc/CarrierSettings/bob_at.pb
+product/etc/CarrierSettings/boost_us.pb
+product/etc/CarrierSettings/boosttmo_us.pb
+product/etc/CarrierSettings/bouygues_fr.pb
+product/etc/CarrierSettings/bsnl_in.pb
+product/etc/CarrierSettings/btb_gb.pb
+product/etc/CarrierSettings/btc_gb.pb
+product/etc/CarrierSettings/cablemovil_es.pb
+product/etc/CarrierSettings/carolinawest_us.pb
+product/etc/CarrierSettings/carrier_list.pb
+product/etc/CarrierSettings/celcom_my.pb
+product/etc/CarrierSettings/cellcom_il.pb
+product/etc/CarrierSettings/cellcom_us.pb
+product/etc/CarrierSettings/cellcommno_us.pb
+product/etc/CarrierSettings/celluarone_us.pb
+product/etc/CarrierSettings/chatr_ca.pb
+product/etc/CarrierSettings/chinamobile_hk.pb
+product/etc/CarrierSettings/cht_tw.pb
+product/etc/CarrierSettings/cityfone_ca.pb
+product/etc/CarrierSettings/claro_br.pb
+product/etc/CarrierSettings/claro_cl.pb
+product/etc/CarrierSettings/claro_co.pb
+product/etc/CarrierSettings/claro_pr.pb
+product/etc/CarrierSettings/commonmvnxatt_us.pb
+product/etc/CarrierSettings/congstar_de.pb
+product/etc/CarrierSettings/consumercellularatt_us.pb
+product/etc/CarrierSettings/consumercellulartmo_us.pb
+product/etc/CarrierSettings/coopvoce_it.pb
+product/etc/CarrierSettings/coppervalley_us.pb
+product/etc/CarrierSettings/coriolis_fr.pb
+product/etc/CarrierSettings/cox_us.pb
+product/etc/CarrierSettings/cricket5g_us.pb
+product/etc/CarrierSettings/cricket_us.pb
+product/etc/CarrierSettings/cspire_nl.pb
+product/etc/CarrierSettings/cspire_us.pb
+product/etc/CarrierSettings/default.pb
+product/etc/CarrierSettings/digi_hu.pb
+product/etc/CarrierSettings/digi_my.pb
+product/etc/CarrierSettings/digi_pt.pb
+product/etc/CarrierSettings/digi_ro.pb
+product/etc/CarrierSettings/digimobil_es.pb
+product/etc/CarrierSettings/dish5gsa_us.pb
+product/etc/CarrierSettings/dishatt_us.pb
+product/etc/CarrierSettings/dito_ph.pb
+product/etc/CarrierSettings/dna_fi.pb
+product/etc/CarrierSettings/docomo_jp.pb
+product/etc/CarrierSettings/docomomvno_jp.pb
+product/etc/CarrierSettings/docomopacific_us.pb
+product/etc/CarrierSettings/dtac_th.pb
+product/etc/CarrierSettings/du_ae.pb
+product/etc/CarrierSettings/eastlink_ca.pb
+product/etc/CarrierSettings/ee_gb.pb
+product/etc/CarrierSettings/eeyoumobility_ca.pb
+product/etc/CarrierSettings/eir_ie.pb
+product/etc/CarrierSettings/elisa1_fi.pb
+product/etc/CarrierSettings/elisa2_fi.pb
+product/etc/CarrierSettings/elisa_ee.pb
+product/etc/CarrierSettings/enetworks_gy.pb
+product/etc/CarrierSettings/enreach_nl.pb
+product/etc/CarrierSettings/entel_cl.pb
+product/etc/CarrierSettings/epic_mt.pb
+product/etc/CarrierSettings/eplus_de.pb
+product/etc/CarrierSettings/erate_no.pb
+product/etc/CarrierSettings/esn_gb.pb
+product/etc/CarrierSettings/etisalat_ae.pb
+product/etc/CarrierSettings/euskaltel_es.pb
+product/etc/CarrierSettings/evolve_us.pb
+product/etc/CarrierSettings/fastweb_it.pb
+product/etc/CarrierSettings/fet_tw.pb
+product/etc/CarrierSettings/fi_at.pb
+product/etc/CarrierSettings/fi_tmo_us.pb
+product/etc/CarrierSettings/fido_ca.pb
+product/etc/CarrierSettings/finetwork_es.pb
+product/etc/CarrierSettings/firstnet_us.pb
+product/etc/CarrierSettings/firstnetpacific2_us.pb
+product/etc/CarrierSettings/firstnetpacific_us.pb
+product/etc/CarrierSettings/fizz_ca.pb
+product/etc/CarrierSettings/fl1_li.pb
+product/etc/CarrierSettings/foroyatele_fo.pb
+product/etc/CarrierSettings/free_fr.pb
+product/etc/CarrierSettings/free_gp.pb
+product/etc/CarrierSettings/free_mq.pb
+product/etc/CarrierSettings/free_re.pb
+product/etc/CarrierSettings/freedommobile_ca.pb
+product/etc/CarrierSettings/gamma_gb.pb
+product/etc/CarrierSettings/gci_us.pb
+product/etc/CarrierSettings/gibtel_gi.pb
+product/etc/CarrierSettings/giffgaff_gb.pb
+product/etc/CarrierSettings/giga_sg.pb
+product/etc/CarrierSettings/globe_ph.pb
+product/etc/CarrierSettings/gomobile_mt.pb
+product/etc/CarrierSettings/grameenphone_bd.pb
+product/etc/CarrierSettings/guuk_es.pb
+product/etc/CarrierSettings/h3_at.pb
+product/etc/CarrierSettings/h3_gb.pb
+product/etc/CarrierSettings/h3_ie.pb
+product/etc/CarrierSettings/h3_se.pb
+product/etc/CarrierSettings/h3g27202_ie.pb
+product/etc/CarrierSettings/halebop_se.pb
+product/etc/CarrierSettings/helium_us.pb
+product/etc/CarrierSettings/help_at.pb
+product/etc/CarrierSettings/homobile_it.pb
+product/etc/CarrierSettings/hotmobile_il.pb
+product/etc/CarrierSettings/ice_no.pb
+product/etc/CarrierSettings/idea_in.pb
+product/etc/CarrierSettings/idmobile_gb.pb
+product/etc/CarrierSettings/iliad_it.pb
+product/etc/CarrierSettings/indosat_id.pb
+product/etc/CarrierSettings/inland_us.pb
+product/etc/CarrierSettings/iwireless_us.pb
+product/etc/CarrierSettings/jazz_pk.pb
+product/etc/CarrierSettings/jazztel_es.pb
+product/etc/CarrierSettings/jcommobile_jp.pb
+product/etc/CarrierSettings/kddi5gsa_jp.pb
+product/etc/CarrierSettings/kddi_jp.pb
+product/etc/CarrierSettings/kddimvno5gsa_jp.pb
+product/etc/CarrierSettings/kddimvno_jp.pb
+product/etc/CarrierSettings/kena_it.pb
+product/etc/CarrierSettings/koodo_ca.pb
+product/etc/CarrierSettings/kpn_nl.pb
+product/etc/CarrierSettings/lebara_es.pb
+product/etc/CarrierSettings/lebara_fr.pb
+product/etc/CarrierSettings/lebara_gb.pb
+product/etc/CarrierSettings/lebara_nl.pb
+product/etc/CarrierSettings/liberty_pr.pb
+product/etc/CarrierSettings/lifecell_ua.pb
+product/etc/CarrierSettings/linemo_jp.pb
+product/etc/CarrierSettings/llamaya_es.pb
+product/etc/CarrierSettings/lmt_lv.pb
+product/etc/CarrierSettings/lowi_es.pb
+product/etc/CarrierSettings/luckymobile_ca.pb
+product/etc/CarrierSettings/lum_ca.pb
+product/etc/CarrierSettings/lyca_es.pb
+product/etc/CarrierSettings/lyca_us.pb
+product/etc/CarrierSettings/lycamobile_gb.pb
+product/etc/CarrierSettings/lycamobile_pt.pb
+product/etc/CarrierSettings/lycamobile_se.pb
+product/etc/CarrierSettings/m1_sg.pb
+product/etc/CarrierSettings/magticom_ge.pb
+product/etc/CarrierSettings/manxcontract_im.pb
+product/etc/CarrierSettings/manxprepaid_im.pb
+product/etc/CarrierSettings/masmovil_es.pb
+product/etc/CarrierSettings/maxis_my.pb
+product/etc/CarrierSettings/mediacom_us.pb
+product/etc/CarrierSettings/melita_mt.pb
+product/etc/CarrierSettings/meo_pt.pb
+product/etc/CarrierSettings/metropcs_us.pb
+product/etc/CarrierSettings/mobifone_vn.pb
+product/etc/CarrierSettings/mobily_sa.pb
+product/etc/CarrierSettings/monacotelecom_mc.pb
+product/etc/CarrierSettings/movistar_co.pb
+product/etc/CarrierSettings/movistar_es.pb
+product/etc/CarrierSettings/movistar_mx.pb
+product/etc/CarrierSettings/mucho_ch.pb
+product/etc/CarrierSettings/mvnoconnect_us.pb
+product/etc/CarrierSettings/nema_fo.pb
+product/etc/CarrierSettings/netcomgroup_fr.pb
+product/etc/CarrierSettings/nexphone_ch.pb
+product/etc/CarrierSettings/nextech_us.pb
+product/etc/CarrierSettings/no_sim.pb
+product/etc/CarrierSettings/nos_pt.pb
+product/etc/CarrierSettings/nova_gr.pb
+product/etc/CarrierSettings/nova_is.pb
+product/etc/CarrierSettings/o2_cz.pb
+product/etc/CarrierSettings/o2_de.pb
+product/etc/CarrierSettings/o2_sk.pb
+product/etc/CarrierSettings/o2postpaid_gb.pb
+product/etc/CarrierSettings/o2prepaid_de.pb
+product/etc/CarrierSettings/o2prepaid_gb.pb
+product/etc/CarrierSettings/omantel_om.pb
+product/etc/CarrierSettings/one_me.pb
+product/etc/CarrierSettings/onecall_no.pb
+product/etc/CarrierSettings/only_yt.pb
+product/etc/CarrierSettings/ooredoo_kw.pb
+product/etc/CarrierSettings/ooredoo_qa.pb
+product/etc/CarrierSettings/optimera_us.pb
+product/etc/CarrierSettings/optus_au.pb
+product/etc/CarrierSettings/orange_be.pb
+product/etc/CarrierSettings/orange_es.pb
+product/etc/CarrierSettings/orange_fr.pb
+product/etc/CarrierSettings/orange_gp.pb
+product/etc/CarrierSettings/orange_lu.pb
+product/etc/CarrierSettings/orange_pl.pb
+product/etc/CarrierSettings/orange_re.pb
+product/etc/CarrierSettings/orange_ro.pb
+product/etc/CarrierSettings/orange_sk.pb
+product/etc/CarrierSettings/others.pb
+product/etc/CarrierSettings/paradisemobile_bm.pb
+product/etc/CarrierSettings/partner_il.pb
+product/etc/CarrierSettings/pcmobilebell_ca.pb
+product/etc/CarrierSettings/pelephone_il.pb
+product/etc/CarrierSettings/pepephone_es.pb
+product/etc/CarrierSettings/play_pl.pb
+product/etc/CarrierSettings/plintron_us.pb
+product/etc/CarrierSettings/plus_pl.pb
+product/etc/CarrierSettings/post_lu.pb
+product/etc/CarrierSettings/postemobile_it.pb
+product/etc/CarrierSettings/povo5gsa_jp.pb
+product/etc/CarrierSettings/povo_jp.pb
+product/etc/CarrierSettings/proximus_be.pb
+product/etc/CarrierSettings/publicmobile_ca.pb
+product/etc/CarrierSettings/pwg_us.pb
+product/etc/CarrierSettings/qlink_us.pb
+product/etc/CarrierSettings/r_es.pb
+product/etc/CarrierSettings/racc_es.pb
+product/etc/CarrierSettings/rakuten_jp.pb
+product/etc/CarrierSettings/redpocketatt_us.pb
+product/etc/CarrierSettings/redpockettmo_us.pb
+product/etc/CarrierSettings/republicwireless_us.pb
+product/etc/CarrierSettings/rjio_in.pb
+product/etc/CarrierSettings/robi_bd.pb
+product/etc/CarrierSettings/rogers5g_ca.pb
+product/etc/CarrierSettings/rogers_ca.pb
+product/etc/CarrierSettings/rogerswpn_ca.pb
+product/etc/CarrierSettings/salt_ch.pb
+product/etc/CarrierSettings/salt_li.pb
+product/etc/CarrierSettings/sasktel_ca.pb
+product/etc/CarrierSettings/sfr_fr.pb
+product/etc/CarrierSettings/shaw_ca.pb
+product/etc/CarrierSettings/simba_sg.pb
+product/etc/CarrierSettings/siminn_is.pb
+product/etc/CarrierSettings/simple_us.pb
+product/etc/CarrierSettings/simyo_es.pb
+product/etc/CarrierSettings/singtel_sg.pb
+product/etc/CarrierSettings/skinny_nz.pb
+product/etc/CarrierSettings/skt_kr.pb
+product/etc/CarrierSettings/sky_gb.pb
+product/etc/CarrierSettings/sky_ie.pb
+product/etc/CarrierSettings/skylo_zz.pb
+product/etc/CarrierSettings/smart_ph.pb
+product/etc/CarrierSettings/smartfren_id.pb
+product/etc/CarrierSettings/smartone_hk.pb
+product/etc/CarrierSettings/smarty_gb.pb
+product/etc/CarrierSettings/softbank_jp.pb
+product/etc/CarrierSettings/solomobile_ca.pb
+product/etc/CarrierSettings/spark_nz.pb
+product/etc/CarrierSettings/spectrum_us.pb
+product/etc/CarrierSettings/spectrummso_us.pb
+product/etc/CarrierSettings/spectrummsotest_us.pb
+product/etc/CarrierSettings/spmtelecom_pm.pb
+product/etc/CarrierSettings/sprint_us.pb
+product/etc/CarrierSettings/sprintprepaid_us.pb
+product/etc/CarrierSettings/sprintwholesale_us.pb
+product/etc/CarrierSettings/spusu_at.pb
+product/etc/CarrierSettings/spusu_ch.pb
+product/etc/CarrierSettings/spusu_gb.pb
+product/etc/CarrierSettings/spusu_it.pb
+product/etc/CarrierSettings/ssimobile_ca.pb
+product/etc/CarrierSettings/starhub_sg.pb
+product/etc/CarrierSettings/stc_bh.pb
+product/etc/CarrierSettings/stc_kw.pb
+product/etc/CarrierSettings/stc_sa.pb
+product/etc/CarrierSettings/strata_us.pb
+product/etc/CarrierSettings/sunrise_ch.pb
+product/etc/CarrierSettings/superdrug_gb.pb
+product/etc/CarrierSettings/sweno_es.pb
+product/etc/CarrierSettings/swisscom_ch.pb
+product/etc/CarrierSettings/swisscom_li.pb
+product/etc/CarrierSettings/swisscommvno_ch.pb
+product/etc/CarrierSettings/talkmobile_gb.pb
+product/etc/CarrierSettings/tango_lu.pb
+product/etc/CarrierSettings/tango_us.pb
+product/etc/CarrierSettings/tbaytel_ca.pb
+product/etc/CarrierSettings/tchibo_at.pb
+product/etc/CarrierSettings/tchibo_de.pb
+product/etc/CarrierSettings/tdc_dk.pb
+product/etc/CarrierSettings/telavox_be.pb
+product/etc/CarrierSettings/telavox_se.pb
+product/etc/CarrierSettings/telcel_mx.pb
+product/etc/CarrierSettings/telco_re.pb
+product/etc/CarrierSettings/tele2_ee.pb
+product/etc/CarrierSettings/tele2_lt.pb
+product/etc/CarrierSettings/tele2_lv.pb
+product/etc/CarrierSettings/tele2_se.pb
+product/etc/CarrierSettings/telecable2_es.pb
+product/etc/CarrierSettings/telekom_de.pb
+product/etc/CarrierSettings/telekom_gr.pb
+product/etc/CarrierSettings/telekom_hr.pb
+product/etc/CarrierSettings/telekom_hu.pb
+product/etc/CarrierSettings/telekom_me.pb
+product/etc/CarrierSettings/telekom_mk.pb
+product/etc/CarrierSettings/telekom_pl.pb
+product/etc/CarrierSettings/telekom_ro.pb
+product/etc/CarrierSettings/telekom_si.pb
+product/etc/CarrierSettings/telekom_sk.pb
+product/etc/CarrierSettings/telemach_hr.pb
+product/etc/CarrierSettings/telemach_si.pb
+product/etc/CarrierSettings/telenet_be.pb
+product/etc/CarrierSettings/telenor_dk.pb
+product/etc/CarrierSettings/telenor_no.pb
+product/etc/CarrierSettings/telenor_pk.pb
+product/etc/CarrierSettings/telenor_se.pb
+product/etc/CarrierSettings/telia_dk.pb
+product/etc/CarrierSettings/telia_ee.pb
+product/etc/CarrierSettings/telia_fi.pb
+product/etc/CarrierSettings/telia_lt.pb
+product/etc/CarrierSettings/telia_no.pb
+product/etc/CarrierSettings/telia_se.pb
+product/etc/CarrierSettings/telkomsel_id.pb
+product/etc/CarrierSettings/tello_us.pb
+product/etc/CarrierSettings/telstra_au.pb
+product/etc/CarrierSettings/telus_ca.pb
+product/etc/CarrierSettings/tesco_gb.pb
+product/etc/CarrierSettings/test001_zz.pb
+product/etc/CarrierSettings/three_dk.pb
+product/etc/CarrierSettings/tigo_co.pb
+product/etc/CarrierSettings/tim_br.pb
+product/etc/CarrierSettings/tim_it.pb
+product/etc/CarrierSettings/tmobile_at.pb
+product/etc/CarrierSettings/tmobile_cz.pb
+product/etc/CarrierSettings/tmobile_nl.pb
+product/etc/CarrierSettings/tmobile_us.pb
+product/etc/CarrierSettings/tmobileprivate_us.pb
+product/etc/CarrierSettings/tmomvno_nl.pb
+product/etc/CarrierSettings/tmomvno_us.pb
+product/etc/CarrierSettings/tracfoneatt_us.pb
+product/etc/CarrierSettings/tracfonetmo_us.pb
+product/etc/CarrierSettings/tracfoneverizon_us.pb
+product/etc/CarrierSettings/truemove_th.pb
+product/etc/CarrierSettings/truphone_us.pb
+product/etc/CarrierSettings/truphone_zz.pb
+product/etc/CarrierSettings/tstar_tw.pb
+product/etc/CarrierSettings/turkcell_tr.pb
+product/etc/CarrierSettings/turktelekom_tr.pb
+product/etc/CarrierSettings/twm_tw.pb
+product/etc/CarrierSettings/u264a_ca.pb
+product/etc/CarrierSettings/u264a_us.pb
+product/etc/CarrierSettings/u264ab_ca.pb
+product/etc/CarrierSettings/u264ao_at.pb
+product/etc/CarrierSettings/u264ap_at.pb
+product/etc/CarrierSettings/ultra_us.pb
+product/etc/CarrierSettings/umobile_my.pb
+product/etc/CarrierSettings/unifi_my.pb
+product/etc/CarrierSettings/unionwireless_us.pb
+product/etc/CarrierSettings/unitedwireless_us.pb
+product/etc/CarrierSettings/uqmobile5gsa_jp.pb
+product/etc/CarrierSettings/uqmobile_jp.pb
+product/etc/CarrierSettings/uscc_us.pb
+product/etc/CarrierSettings/verizon_us.pb
+product/etc/CarrierSettings/verymobile_it.pb
+product/etc/CarrierSettings/viaero_us.pb
+product/etc/CarrierSettings/videotron_ca.pb
+product/etc/CarrierSettings/viettel_vn.pb
+product/etc/CarrierSettings/vimla_se.pb
+product/etc/CarrierSettings/vinaphone_vn.pb
+product/etc/CarrierSettings/virgin_ca.pb
+product/etc/CarrierSettings/virgin_gb.pb
+product/etc/CarrierSettings/virgin_us.pb
+product/etc/CarrierSettings/virgintelco_es.pb
+product/etc/CarrierSettings/visible_us.pb
+product/etc/CarrierSettings/visiblev_us.pb
+product/etc/CarrierSettings/viti_pf.pb
+product/etc/CarrierSettings/vivacom_bg.pb
+product/etc/CarrierSettings/vivo_br.pb
+product/etc/CarrierSettings/vodafone_au.pb
+product/etc/CarrierSettings/vodafone_cz.pb
+product/etc/CarrierSettings/vodafone_de.pb
+product/etc/CarrierSettings/vodafone_es.pb
+product/etc/CarrierSettings/vodafone_gb.pb
+product/etc/CarrierSettings/vodafone_gr.pb
+product/etc/CarrierSettings/vodafone_hu.pb
+product/etc/CarrierSettings/vodafone_ie.pb
+product/etc/CarrierSettings/vodafone_in.pb
+product/etc/CarrierSettings/vodafone_is.pb
+product/etc/CarrierSettings/vodafone_it.pb
+product/etc/CarrierSettings/vodafone_nl.pb
+product/etc/CarrierSettings/vodafone_nz.pb
+product/etc/CarrierSettings/vodafone_om.pb
+product/etc/CarrierSettings/vodafone_pt.pb
+product/etc/CarrierSettings/vodafone_qa.pb
+product/etc/CarrierSettings/vodafone_ro.pb
+product/etc/CarrierSettings/vodafone_tr.pb
+product/etc/CarrierSettings/walmart_mx.pb
+product/etc/CarrierSettings/webbing_hk.pb
+product/etc/CarrierSettings/windtre_it.pb
+product/etc/CarrierSettings/xfinity2_us.pb
+product/etc/CarrierSettings/xfinity_us.pb
+product/etc/CarrierSettings/xfinitymso_us.pb
+product/etc/CarrierSettings/yes_my.pb
+product/etc/CarrierSettings/yesss_at.pb
+product/etc/CarrierSettings/yettel_bg.pb
+product/etc/CarrierSettings/yettel_hu.pb
+product/etc/CarrierSettings/yoigo_es.pb
+product/etc/CarrierSettings/zain_bh.pb
+product/etc/CarrierSettings/zain_kw.pb
+product/etc/CarrierSettings/zain_sa.pb
+product/etc/CarrierSettings/zeop_re.pb
+product/etc/CarrierSettings/ztar_us.pb
--- a/oriole/proprietary-files-vendor.txt
+++ b/oriole/proprietary-files-vendor.txt
--- a/oriole/proprietary-files.txt
+++ b/oriole/proprietary-files.txt
@@ -0,0 +1,179 @@
+# All blobs are extracted from Google factory images for each new ASB
+
+# product partition
+
+# AiAi
+product/priv-app/DeviceIntelligenceNetworkPrebuilt-U.32_V.7_playstore_astrea_20240725.00_RC01/DeviceIntelligenceNetworkPrebuilt-U.32_V.7_playstore_astrea_20240725.00_RC01.apk;PRESIGNED
+product/priv-app/DevicePersonalizationPrebuiltPixel2021-U.32_V.7_playstore_aiai_20240725.00_RC08/DevicePersonalizationPrebuiltPixel2021-U.32_V.7_playstore_aiai_20240725.00_RC08.apk;PRESIGNED
+
+# Audio
+product/etc/ambient/matcher_tah.leveldb
+product/etc/firmware/music_detector.descriptor
+product/etc/firmware/music_detector.sound_model
+product/etc/firmware/music_detector.sound_model_2
+product/etc/firmware/music_detector.sound_model_tflite
+
+# Camera
+product/priv-app/GoogleCamera/GoogleCamera.apk;OVERRIDES=Aperture,Camera2;PRESIGNED
+
+# Camera extensions
+product/etc/permissions/androidx.camera.extensions.impl.xml
+product/priv-app/PixelCameraServices/PixelCameraServices.apk;PRESIGNED
+
+# Camera services
+product/etc/permissions/com.google.pixel.camera.connectivity.impl.xml
+product/etc/permissions/com.google.pixel.camera.services.cameraidremapper.impl.xml
+product/etc/permissions/com.google.pixel.camera.services.lyricconfigprovider.impl.xml
+
+# Felica
+product/etc/felica/common.cfg
+product/etc/felica/mfm.cfg
+product/etc/felica/mfs.cfg
+
+# Hardware info
+product/etc/permissions/com.google.android.hardwareinfo.xml
+product/framework/libhwinfo.jar
+product/priv-app/HardwareInfo/HardwareInfo.apk;PRESIGNED
+
+# Hotword
+product/priv-app/HotwordEnrollmentOKGoogleFUSIONPro/HotwordEnrollmentOKGoogleFUSIONPro.apk;PRESIGNED
+product/priv-app/HotwordEnrollmentXGoogleFUSIONPro/HotwordEnrollmentXGoogleFUSIONPro.apk;PRESIGNED
+
+# IMS
+product/etc/sysconfig/allowlist_com.shannon.imsservice.xml
+
+# Permissions
+product/etc/permissions/privapp-permissions-google-p.xml:product/etc/permissions/privapp-permissions-google-p-evolution.xml
+product/etc/sysconfig/GoogleCamera_6gb_or_more_ram.xml
+product/etc/sysconfig/google-hiddenapi-package-whitelist.xml
+product/etc/sysconfig/nexus.xml
+product/etc/sysconfig/pixel_experience_2017.xml
+product/etc/sysconfig/pixel_experience_2018.xml
+product/etc/sysconfig/pixel_experience_2019.xml
+product/etc/sysconfig/pixel_experience_2019_midyear.xml
+product/etc/sysconfig/pixel_experience_2020.xml
+product/etc/sysconfig/pixel_experience_2020_midyear.xml
+product/etc/sysconfig/pixel_experience_2021.xml
+product/etc/sysconfig/pixel_experience_2021_midyear.xml
+
+# Radio
+product/etc/permissions/com.android.sdm.plugins.connmo.xml
+product/etc/permissions/com.android.sdm.plugins.dcmo.xml
+product/etc/permissions/com.android.sdm.plugins.diagmon.xml
+product/lib/libdmengine.so;SYMLINK=product/priv-app/DMService/lib/arm/libdmengine.so
+product/lib/libdmjavaplugin.so;SYMLINK=product/priv-app/DMService/lib/arm/libdmjavaplugin.so
+product/lib64/libdmengine.so;SYMLINK=product/priv-app/DMService/lib/arm64/libdmengine.so
+product/lib64/libdmjavaplugin.so;SYMLINK=product/priv-app/DMService/lib/arm64/libdmjavaplugin.so
+product/priv-app/CarrierSettings_signed_51.0.707712815/CarrierSettings_signed_51.0.707712815.apk;PRESIGNED
+product/priv-app/CarrierWifi/CarrierWifi.apk;PRESIGNED
+product/priv-app/ConnMO/ConnMO.apk
+product/priv-app/DCMO/DCMO.apk
+product/priv-app/DMService/DMService.apk
+product/priv-app/DiagMon/DiagMon.apk
+product/priv-app/EuiccGoogle/EuiccGoogle.apk;PRESIGNED
+product/priv-app/TetheringEntitlement/TetheringEntitlement.apk
+
+# VZW
+product/app/VZWAPNLib/VZWAPNLib.apk;PRESIGNED
+product/etc/permissions/com.android.omadm.service.xml
+product/etc/permissions/com.google.omadm.trigger.xml
+product/etc/permissions/com.verizon.apn.xml
+product/etc/permissions/com.verizon.services.xml
+product/etc/permissions/features-verizon.xml
+product/etc/sysconfig/allowlist_com.android.omadm.service.xml
+product/priv-app/AppDirectedSMSService/AppDirectedSMSService.apk;PRESIGNED
+product/priv-app/OemDmTrigger/OemDmTrigger.apk
+product/priv-app/WfcActivation/WfcActivation.apk;PRESIGNED
+
+# system partition
+
+# IMS
+system/bin/oem-iptables-init.sh
+
+# system_ext partition
+
+# Camera extensions
+system_ext/etc/permissions/com.google.android.camera.experimental2022_system.xml
+system_ext/etc/permissions/com.google.android.camera.extensions.xml
+system_ext/etc/permissions/com.google.android.camerax.extensions.xml
+system_ext/framework/com.google.android.camera.experimental2022_system.jar
+system_ext/framework/com.google.android.camera.extensions.jar
+system_ext/framework/com.google.android.camerax.extensions.jar
+
+# Camera services
+system_ext/app/PersistentBackgroundCameraServices/PersistentBackgroundCameraServices.apk
+system_ext/etc/permissions/com.google.pixel.camera.connectivity.xml
+system_ext/etc/permissions/com.google.pixel.camera.services.cameraidremapper.xml
+system_ext/etc/permissions/com.google.pixel.camera.services.lyricconfigprovider.xml
+system_ext/etc/vintf/manifest/com.google.pixel.camera.services@1.0-service-google.xml
+system_ext/framework/com.google.pixel.camera.connectivity.jar
+system_ext/framework/com.google.pixel.camera.services.cameraidremapper.jar
+system_ext/framework/com.google.pixel.camera.services.lyricconfigprovider.jar
+
+# Edge TPU
+system_ext/bin/hw/vendor.google.edgetpu_app_service@1.0-service
+system_ext/etc/init/vendor.google.edgetpu_app_service@1.0-service.rc
+system_ext/etc/public.libraries-google.txt
+system_ext/etc/vintf/manifest/vendor.google.edgetpu_app_service@1.0-service.xml
+system_ext/lib64/com.google.edgetpu_app_service-V3-ndk.so
+system_ext/lib64/com.google.edgetpu_vendor_service-V2-ndk.so
+
+# HBM
+system_ext/lib64/libhbmsvmanager_jni.so;SYMLINK=system_ext/priv-app/HbmSVManager/lib/arm64/libhbmsvmanager_jni.so
+system_ext/priv-app/HbmSVManager/HbmSVManager.apk
+
+# Hotword
+system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml
+system_ext/framework/com.android.hotwordenrollment.common.util.jar
+
+# IMS
+system_ext/etc/permissions/com.shannon.imsservice.xml
+system_ext/etc/permissions/com.shannon.qualifiednetworksservice.xml
+system_ext/etc/permissions/com.shannon.rcsservice.xml
+system_ext/lib/libmediaadaptor.so
+system_ext/lib64/libmediaadaptor.so
+system_ext/priv-app/ShannonIms/ShannonIms.apk;PRESIGNED
+system_ext/priv-app/ShannonQualifiedNetworksService/ShannonQualifiedNetworksService.apk;PRESIGNED
+system_ext/priv-app/ShannonRcs/ShannonRcs.apk;PRESIGNED
+
+# IWLAN
+system_ext/etc/permissions/privapp-permlist_com.google.pixel.iwlan.xml
+system_ext/etc/sysconfig/sysconfig_com.google.pixel.iwlan.xml
+system_ext/priv-app/PixelIwlan/PixelIwlan.apk
+
+# Permissions
+system_ext/etc/permissions/privapp-permissions-google-se.xml:system_ext/etc/permissions/privapp-permissions-google-se-evolution.xml
+
+# Radio
+system_ext/etc/default-permissions/default-permissions-euiccpixel.xml
+system_ext/etc/permissions/com.android.omadm.radioconfig.xml
+system_ext/etc/permissions/com.google.euiccpixel.permissions.xml
+system_ext/etc/permissions/com.google.euiccpixel.xml
+system_ext/etc/permissions/google-ril.xml
+system_ext/framework/RadioConfigLib.jar
+system_ext/framework/google-ril.jar
+system_ext/priv-app/CarrierSetup/CarrierSetup.apk;PRESIGNED
+system_ext/priv-app/ConnectivityThermalPowerManager/ConnectivityThermalPowerManager.apk
+system_ext/priv-app/EuiccGoogleOverlay/EuiccGoogleOverlay.apk
+system_ext/priv-app/EuiccSupportPixel/DKA_RC7_DVT.in
+system_ext/priv-app/EuiccSupportPixel/DKA_RC7_DVT.up
+system_ext/priv-app/EuiccSupportPixel/DKA_RC7_EVT.up
+system_ext/priv-app/EuiccSupportPixel/EuiccSupportPixel.apk;PRESIGNED
+system_ext/priv-app/EuiccSupportPixel/esim-full-ofl-v1.img
+system_ext/priv-app/EuiccSupportPixel/esim-full-v0-security.img
+system_ext/priv-app/EuiccSupportPixel/esim-full-v0.img
+system_ext/priv-app/EuiccSupportPixel/esim-full-v1.img
+system_ext/priv-app/EuiccSupportPixelPermissions/EuiccSupportPixelPermissions.apk;PRESIGNED
+system_ext/priv-app/RilConfigService/RilConfigService.apk
+system_ext/priv-app/grilservice/grilservice.apk;PRESIGNED
+
+# RIL
+system_ext/app/OemRilHookService/OemRilHookService.apk
+system_ext/etc/permissions/com.samsung.slsi.telephony.oemril.xml
+system_ext/etc/permissions/oemrilhook.xml
+system_ext/framework/oemrilhook.jar
+system_ext/priv-app/OemRilService/OemRilService.apk;PRESIGNED
+
+# VZW
+system_ext/etc/permissions/vzw_mvs_permissions.xml
+system_ext/priv-app/MyVerizonServices/MyVerizonServices.apk;PRESIGNED
--- a/oriole/proprietary-firmware.txt
+++ b/oriole/proprietary-firmware.txt
@@ -0,0 +1,11 @@
+# All firmware images are extracted from Google factory images for each new ASB
+
+abl.img;AB
+bl1.img;AB
+bl2.img;AB
+bl31.img;AB
+gsa.img;AB
+ldfw.img;AB
+modem.img;AB
+pbl.img;AB
+tzsw.img;AB
--- a/oriole/rro_overlays/HbmSVManagerOverlay/Android.bp
+++ b/oriole/rro_overlays/HbmSVManagerOverlay/Android.bp
@@ -0,0 +1,8 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "HbmSVManagerOverlay",
+    vendor: true
+}
--- a/oriole/rro_overlays/HbmSVManagerOverlay/AndroidManifest.xml
+++ b/oriole/rro_overlays/HbmSVManagerOverlay/AndroidManifest.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.hbmsvmanager.overlay">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="0"
+        android:targetPackage="com.android.hbmsvmanager" />
+</manifest>
--- a/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_0_cal0.png
+++ b/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_0_cal0.png
--- a/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_1_cal0.png
+++ b/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_1_cal0.png
--- a/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_2_cal0.png
+++ b/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_2_cal0.png
--- a/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_3_cal0.png
+++ b/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_3_cal0.png
--- a/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_4_cal0.png
+++ b/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_4_cal0.png
--- a/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_5_cal0.png
+++ b/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_5_cal0.png
--- a/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_6_cal0.png
+++ b/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_6_cal0.png
--- a/oriole/rro_overlays/HbmSVManagerOverlay/res/values/config.xml
+++ b/oriole/rro_overlays/HbmSVManagerOverlay/res/values/config.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2020, 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.
+*/
+-->
+
+<resources>
+    <string-array name="config_calibrated_compensation_images">
+        <item>SCI_0_cal0.png</item>
+        <item>SCI_1_cal0.png</item>
+        <item>SCI_2_cal0.png</item>
+        <item>SCI_3_cal0.png</item>
+        <item>SCI_4_cal0.png</item>
+        <item>SCI_5_cal0.png</item>
+        <item>SCI_6_cal0.png</item>
+    </string-array>
+    <array name="config_compensation_images">
+        <item>@drawable/SCI_0_cal0</item>
+        <item>@drawable/SCI_1_cal0</item>
+        <item>@drawable/SCI_2_cal0</item>
+        <item>@drawable/SCI_3_cal0</item>
+        <item>@drawable/SCI_4_cal0</item>
+        <item>@drawable/SCI_5_cal0</item>
+        <item>@drawable/SCI_6_cal0</item>
+    </array>
+    <integer name="config_compensation_filter_horizon">1500</integer>
+    <dimen name="config_compensation_filter_intercept">10.0</dimen>
+    <array name="config_compensation_thresholds">
+        <item>15000.0</item>
+        <item>30000.0</item>
+        <item>45000.0</item>
+        <item>60000.0</item>
+        <item>70000.0</item>
+        <item>80000.0</item>
+        <item>100000.0</item>
+    </array>
+</resources>
--- a/oriole/rro_overlays/NfcOverlay/res/values/config.xml
+++ b/oriole/rro_overlays/NfcOverlay/res/values/config.xml
@@ -30,7 +30,7 @@
    <item>36</item>
  </integer-array>
  <integer-array name="antenna_y">
-    <item>106</item>
+    <item>51</item>
  </integer-array>
  <bool name="nfc_observe_mode_supported">true</bool>
 </resources>
--- a/oriole/setup-makefiles.py
+++ b/oriole/setup-makefiles.py
@@ -0,0 +1 @@
+#!./extract-files.py --regenerate_makefiles
--- a/oriole/skip-files-vendor.txt
+++ b/oriole/skip-files-vendor.txt
--- a/oriole/vendor.prop
+++ b/oriole/vendor.prop
@@ -0,0 +1,10 @@
+# DRM
+drm.service.enabled=true
+media.mediadrmservice.enable=true
+
+# Radio
+persist.vendor.ril.ecc.use.xml=1
+persist.vendor.ril.support_nr_ds=0
+persist.vendor.ril.use_radio_hal=1.6
+ro.vendor.config.build_carrier=europen
+vendor.rild.libpath=libsitril.so
--- a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
+++ b/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2019, The LineageOS 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.
+*/
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- Whether the device supports wireless charging or not -->
+    <bool name="config_deviceSupportsWirelessCharging">true</bool>
+
+</resources>
--- a/overlay-lineage/packages/apps/Settings/res/values/config.xml
+++ b/overlay-lineage/packages/apps/Settings/res/values/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2021 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.
+-->
+
+<resources>
+    <!-- Whether to show Smooth Display feature in Settings Options -->
+    <bool name="config_show_smooth_display">true</bool>
+</resources>
--- a/powerhint-oriole-mainline.json
+++ b/powerhint-oriole-mainline.json
@@ -1023,18 +1023,6 @@
      "Duration": 50,
      "Value": "1"
    },
-    {
-      "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL",
-      "Node": "LimitFlashCurrent",
-      "Duration": 0,
-      "Value": "100"
-    },
-    {
-      "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE",
-      "Node": "LimitFlashCurrent",
-      "Duration": 0,
-      "Value": "1500"
-    },
    {
      "PowerHint": "EXPENSIVE_RENDERING",
      "Node": "PowerHALRenderingState",
@@ -1230,16 +1218,26 @@
      "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,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
    },
    {
      "Name": "REFRESH_90FPS",
@@ -1254,16 +1252,26 @@
      "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,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
    },
    {
      "Name": "REFRESH_60FPS",
@@ -1278,16 +1286,26 @@
      "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,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
    },
    {
      "Name": "UiHighBoostWithoutPid",
@@ -1332,8 +1350,6 @@
      "UclampMin_High": 53,
      "UclampMin_Low": 53,
      "ReportingRateLimitNs": 1,
-      "EarlyBoost_On": false,
-      "EarlyBoost_TimeFactor": 0,
      "TargetTimeFactor": 1,
      "StaleTimeFactor": 5
    },
@@ -1356,8 +1372,6 @@
      "UclampMin_High": 0,
      "UclampMin_Low": 0,
      "ReportingRateLimitNs": 1,
-      "EarlyBoost_On": false,
-      "EarlyBoost_TimeFactor": 0,
      "TargetTimeFactor": 1,
      "StaleTimeFactor": 5
    }
--- a/powerhint-oriole.json
+++ b/powerhint-oriole.json
@@ -319,14 +319,6 @@
      ],
      "ResetOnInit": true
    },
-    {
-      "Name": "NewlyIdleBalancer",
-      "Path": "/proc/vendor_sched/idle_balancer",
-      "Values": [
-        "0",
-        "1"
-      ]
-    },
    {
      "Name": "LimitFlashCurrent",
      "Path": "vendor.camera.max_flash_current",
@@ -1070,12 +1062,6 @@
      "Duration": 0,
      "Value": "0"
    },
-    {
-      "PowerHint": "CAMERA_STREAMING_EXTREME",
-      "Node": "NewlyIdleBalancer",
-      "Duration": 0,
-      "Value": "0"
-    },
    {
      "PowerHint": "CAMERA_STREAMING_HIGH",
      "Node": "PowerHALCameraRunning",
@@ -1148,12 +1134,6 @@
      "Duration": 0,
      "Value": "0"
    },
-    {
-      "PowerHint": "CAMERA_STREAMING_HIGH",
-      "Node": "NewlyIdleBalancer",
-      "Duration": 0,
-      "Value": "0"
-    },
    {
      "PowerHint": "CAMERA_STREAMING_STANDARD",
      "Node": "PowerHALCameraRunning",
@@ -1208,12 +1188,6 @@
      "Duration": 0,
      "Value": "0"
    },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "NewlyIdleBalancer",
-      "Duration": 0,
-      "Value": "0"
-    },
    {
      "PowerHint": "CAMERA_STREAMING_LOW",
      "Node": "PowerHALCameraRunning",
@@ -1274,12 +1248,6 @@
      "Duration": 0,
      "Value": "0"
    },
-    {
-      "PowerHint": "CAMERA_STREAMING_LOW",
-      "Node": "NewlyIdleBalancer",
-      "Duration": 0,
-      "Value": "0"
-    },
    {
      "PowerHint": "CAMERA_VIDEO_RECORDING",
      "Type": "MaskHint",
@@ -1491,18 +1459,6 @@
      "Duration": 50,
      "Value": "1"
    },
-    {
-      "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL",
-      "Node": "LimitFlashCurrent",
-      "Duration": 0,
-      "Value": "100"
-    },
-    {
-      "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE",
-      "Node": "LimitFlashCurrent",
-      "Duration": 0,
-      "Value": "1500"
-    },
    {
      "PowerHint": "EXPENSIVE_RENDERING",
      "Node": "PowerHALRenderingState",
@@ -1746,16 +1702,27 @@
      "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,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
    },
    {
      "Name": "REFRESH_90FPS",
@@ -1770,16 +1737,27 @@
      "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,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
    },
    {
      "Name": "REFRESH_60FPS",
@@ -1794,16 +1772,27 @@
      "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,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
    },
    {
      "Name": "UiHighBoostWithoutPid",
@@ -1823,9 +1812,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 +1835,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 +1858,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
    }
--- a/powerhint-raven-mainline.json
+++ b/powerhint-raven-mainline.json
@@ -1004,18 +1004,6 @@
      "Duration": 50,
      "Value": "1"
    },
-    {
-      "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL",
-      "Node": "LimitFlashCurrent",
-      "Duration": 0,
-      "Value": "100"
-    },
-    {
-      "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE",
-      "Node": "LimitFlashCurrent",
-      "Duration": 0,
-      "Value": "1500"
-    },
    {
      "PowerHint": "EXPENSIVE_RENDERING",
      "Node": "PowerHALRenderingState",
@@ -1211,16 +1199,26 @@
      "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,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
    },
    {
      "Name": "REFRESH_90FPS",
@@ -1235,16 +1233,26 @@
      "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,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
    },
    {
      "Name": "REFRESH_60FPS",
@@ -1259,16 +1267,26 @@
      "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,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
    },
    {
      "Name": "UiHighBoostWithoutPid",
@@ -1289,8 +1307,6 @@
      "UclampMin_High": 197,
      "UclampMin_Low": 197,
      "ReportingRateLimitNs": 1,
-      "EarlyBoost_On": false,
-      "EarlyBoost_TimeFactor": 0,
      "TargetTimeFactor": 1,
      "StaleTimeFactor": 5
    },
@@ -1313,8 +1329,6 @@
      "UclampMin_High": 53,
      "UclampMin_Low": 53,
      "ReportingRateLimitNs": 1,
-      "EarlyBoost_On": false,
-      "EarlyBoost_TimeFactor": 0,
      "TargetTimeFactor": 1,
      "StaleTimeFactor": 5
    },
@@ -1337,8 +1351,6 @@
      "UclampMin_High": 0,
      "UclampMin_Low": 0,
      "ReportingRateLimitNs": 1,
-      "EarlyBoost_On": false,
-      "EarlyBoost_TimeFactor": 0,
      "TargetTimeFactor": 1,
      "StaleTimeFactor": 5
    }
--- a/powerhint-raven.json
+++ b/powerhint-raven.json
@@ -318,14 +318,6 @@
      ],
      "ResetOnInit": true
    },
-    {
-      "Name": "NewlyIdleBalancer",
-      "Path": "/proc/vendor_sched/idle_balancer",
-      "Values": [
-        "0",
-        "1"
-      ]
-    },
    {
      "Name": "LimitFlashCurrent",
      "Path": "vendor.camera.max_flash_current",
@@ -1069,12 +1061,6 @@
      "Duration": 0,
      "Value": "0"
    },
-    {
-      "PowerHint": "CAMERA_STREAMING_EXTREME",
-      "Node": "NewlyIdleBalancer",
-      "Duration": 0,
-      "Value": "0"
-    },
    {
      "PowerHint": "CAMERA_STREAMING_HIGH",
      "Node": "PowerHALCameraRunning",
@@ -1147,12 +1133,6 @@
      "Duration": 0,
      "Value": "0"
    },
-    {
-      "PowerHint": "CAMERA_STREAMING_HIGH",
-      "Node": "NewlyIdleBalancer",
-      "Duration": 0,
-      "Value": "0"
-    },
    {
      "PowerHint": "CAMERA_STREAMING_STANDARD",
      "Node": "PowerHALCameraRunning",
@@ -1207,12 +1187,6 @@
      "Duration": 0,
      "Value": "0"
    },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "NewlyIdleBalancer",
-      "Duration": 0,
-      "Value": "0"
-    },
    {
      "PowerHint": "CAMERA_STREAMING_LOW",
      "Node": "PowerHALCameraRunning",
@@ -1273,12 +1247,6 @@
      "Duration": 0,
      "Value": "0"
    },
-    {
-      "PowerHint": "CAMERA_STREAMING_LOW",
-      "Node": "NewlyIdleBalancer",
-      "Duration": 0,
-      "Value": "0"
-    },
    {
      "PowerHint": "CAMERA_VIDEO_RECORDING",
      "Type": "MaskHint",
@@ -1472,18 +1440,6 @@
      "Duration": 50,
      "Value": "1"
    },
-    {
-      "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL",
-      "Node": "LimitFlashCurrent",
-      "Duration": 0,
-      "Value": "100"
-    },
-    {
-      "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE",
-      "Node": "LimitFlashCurrent",
-      "Duration": 0,
-      "Value": "1500"
-    },
    {
      "PowerHint": "EXPENSIVE_RENDERING",
      "Node": "PowerHALRenderingState",
@@ -1727,16 +1683,27 @@
      "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,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
    },
    {
      "Name": "REFRESH_90FPS",
@@ -1751,16 +1718,27 @@
      "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,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
    },
    {
      "Name": "REFRESH_60FPS",
@@ -1775,16 +1753,27 @@
      "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,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
    },
    {
      "Name": "UiHighBoostWithoutPid",
@@ -1804,9 +1793,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 +1816,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 +1839,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
    }
--- a/powerhint-slider.json
+++ b/powerhint-slider.json
@@ -1348,18 +1348,6 @@
      "Duration": 50,
      "Value": "1"
    },
-    {
-      "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL",
-      "Node": "LimitFlashCurrent",
-      "Duration": 0,
-      "Value": "100"
-    },
-    {
-      "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE",
-      "Node": "LimitFlashCurrent",
-      "Duration": 0,
-      "Value": "1500"
-    },
    {
      "PowerHint": "EXPENSIVE_RENDERING",
      "Node": "PowerHALRenderingState",
@@ -1503,6 +1491,7 @@
      "UclampMin_Init": 232,
      "UclampMin_High": 480,
      "UclampMin_Low": 2,
+      "UclampMax_Efficient": 400,
      "SamplingWindow_P": 1,
      "SamplingWindow_I": 0,
      "SamplingWindow_D": 1,
@@ -1510,7 +1499,17 @@
      "EarlyBoost_On": false,
      "EarlyBoost_TimeFactor": 0.0,
      "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 20.0
+      "StaleTimeFactor": 20.0,
+      "HeuristicBoost_On": true,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
    },
    {
      "Name": "REFRESH_90FPS",
@@ -1527,6 +1526,7 @@
      "UclampMin_Init": 162,
      "UclampMin_High": 480,
      "UclampMin_Low": 2,
+      "UclampMax_Efficient": 400,
      "SamplingWindow_P": 1,
      "SamplingWindow_I": 0,
      "SamplingWindow_D": 1,
@@ -1534,7 +1534,17 @@
      "EarlyBoost_On": false,
      "EarlyBoost_TimeFactor": 0.0,
      "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 20.0
+      "StaleTimeFactor": 20.0,
+      "HeuristicBoost_On": true,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
    },
    {
      "Name": "REFRESH_60FPS",
@@ -1551,6 +1561,7 @@
      "UclampMin_Init": 162,
      "UclampMin_High": 480,
      "UclampMin_Low": 2,
+      "UclampMax_Efficient": 400,
      "SamplingWindow_P": 1,
      "SamplingWindow_I": 0,
      "SamplingWindow_D": 1,
@@ -1558,7 +1569,17 @@
      "EarlyBoost_On": false,
      "EarlyBoost_TimeFactor": 0.0,
      "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 20.0
+      "StaleTimeFactor": 20.0,
+      "HeuristicBoost_On": true,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
    },
    {
      "Name": "UiHighBoostWithoutPid",
@@ -1578,6 +1599,7 @@
      "UclampMin_Init": 250,
      "UclampMin_High": 197,
      "UclampMin_Low": 197,
+      "UclampMax_Efficient": 400,
      "ReportingRateLimitNs": 1,
      "EarlyBoost_On": false,
      "EarlyBoost_TimeFactor": 0.0,
@@ -1602,6 +1624,7 @@
      "UclampMin_Init": 250,
      "UclampMin_High": 53,
      "UclampMin_Low": 53,
+      "UclampMax_Efficient": 400,
      "ReportingRateLimitNs": 1,
      "EarlyBoost_On": false,
      "EarlyBoost_TimeFactor": 0.0,
@@ -1626,6 +1649,7 @@
      "UclampMin_Init": 250,
      "UclampMin_High": 0,
      "UclampMin_Low": 0,
+      "UclampMax_Efficient": 400,
      "ReportingRateLimitNs": 1,
      "EarlyBoost_On": false,
      "EarlyBoost_TimeFactor": 0.0,
--- a/powerhint-whitefin.json
+++ b/powerhint-whitefin.json
@@ -1333,18 +1333,6 @@
      "Duration": 50,
      "Value": "1"
    },
-    {
-      "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL",
-      "Node": "LimitFlashCurrent",
-      "Duration": 0,
-      "Value": "100"
-    },
-    {
-      "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE",
-      "Node": "LimitFlashCurrent",
-      "Duration": 0,
-      "Value": "1500"
-    },
    {
      "PowerHint": "EXPENSIVE_RENDERING",
      "Node": "PowerHALRenderingState",
@@ -1470,6 +1458,7 @@
      "UclampMin_Init": 232,
      "UclampMin_High": 480,
      "UclampMin_Low": 2,
+      "UclampMax_Efficient": 400,
      "SamplingWindow_P": 1,
      "SamplingWindow_I": 0,
      "SamplingWindow_D": 1,
@@ -1477,7 +1466,17 @@
      "EarlyBoost_On": false,
      "EarlyBoost_TimeFactor": 0.0,
      "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 20.0
+      "StaleTimeFactor": 20.0,
+      "HeuristicBoost_On": true,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
    },
    {
      "Name": "REFRESH_90FPS",
@@ -1494,6 +1493,7 @@
      "UclampMin_Init": 162,
      "UclampMin_High": 480,
      "UclampMin_Low": 2,
+      "UclampMax_Efficient": 400,
      "SamplingWindow_P": 1,
      "SamplingWindow_I": 0,
      "SamplingWindow_D": 1,
@@ -1501,7 +1501,17 @@
      "EarlyBoost_On": false,
      "EarlyBoost_TimeFactor": 0.0,
      "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 20.0
+      "StaleTimeFactor": 20.0,
+      "HeuristicBoost_On": true,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
    },
    {
      "Name": "REFRESH_60FPS",
@@ -1518,6 +1528,7 @@
      "UclampMin_Init": 162,
      "UclampMin_High": 480,
      "UclampMin_Low": 2,
+      "UclampMax_Efficient": 400,
      "SamplingWindow_P": 1,
      "SamplingWindow_I": 0,
      "SamplingWindow_D": 1,
@@ -1525,7 +1536,17 @@
      "EarlyBoost_On": false,
      "EarlyBoost_TimeFactor": 0.0,
      "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 20.0
+      "StaleTimeFactor": 20.0,
+      "HeuristicBoost_On": true,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
    },
    {
      "Name": "UiHighBoostWithoutPid",
@@ -1545,6 +1566,7 @@
      "UclampMin_Init": 250,
      "UclampMin_High": 197,
      "UclampMin_Low": 197,
+      "UclampMax_Efficient": 400,
      "ReportingRateLimitNs": 1,
      "EarlyBoost_On": false,
      "EarlyBoost_TimeFactor": 0.0,
@@ -1569,6 +1591,7 @@
      "UclampMin_Init": 250,
      "UclampMin_High": 53,
      "UclampMin_Low": 53,
+      "UclampMax_Efficient": 400,
      "ReportingRateLimitNs": 1,
      "EarlyBoost_On": false,
      "EarlyBoost_TimeFactor": 0.0,
@@ -1593,6 +1616,7 @@
      "UclampMin_Init": 250,
      "UclampMin_High": 0,
      "UclampMin_Low": 0,
+      "UclampMax_Efficient": 400,
      "ReportingRateLimitNs": 1,
      "EarlyBoost_On": false,
      "EarlyBoost_TimeFactor": 0.0,
--- a/raven/Android.bp
+++ b/raven/Android.bp
@@ -0,0 +1,11 @@
+//
+// SPDX-FileCopyrightText: 2024 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+prebuilt_etc {
+    name: "init.recovery.raven.touch.rc",
+    src: "init.recovery.touch.rc",
+    sub_dir: "init",
+    recovery: true,
+}
--- a/raven/BoardConfig.mk
+++ b/raven/BoardConfig.mk
@@ -18,20 +18,12 @@
 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
-
 ifdef AUTOMOTIVE_PRODUCT_PATH
  #RBC# include_top device/google/auto_tcu
  #RBC# include_top device/google/pixel_tcu
@@ -47,7 +39,19 @@ USES_DEVICE_GOOGLE_RAVIOLE := true
 BOARD_KERNEL_CMDLINE += disable_dma32=on

 include device/google/gs101/BoardConfig-common.mk
-include device/google/gs101-sepolicy/raven-sepolicy.mk
+include device/google/gs101/sepolicy/raven-sepolicy.mk
 include device/google/gs101/wifi/BoardConfig-wifi.mk
 -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 -include vendor/google_devices/raven/proprietary/BoardConfigVendor.mk
+
+ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+-include device/google/common/etm/BoardUserdebugModules.mk
+endif
+endif
+
+DEVICE_PATH := device/google/raviole
+VENDOR_PATH := vendor/google/raven
+include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk
+include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigEvolution.mk
--- a/raven/BoardConfigEvolution.mk
+++ b/raven/BoardConfigEvolution.mk
@@ -0,0 +1,6 @@
+#
+# SPDX-FileCopyrightText: 2024 The Evolution X Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+include $(DEVICE_PATH)/BoardConfigEvolution.mk
--- a/raven/BoardConfigLineage.mk
+++ b/raven/BoardConfigLineage.mk
@@ -0,0 +1,9 @@
+#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# SPDX-License-Identifier: Apache-2.0
+#
+
+include $(DEVICE_PATH)/BoardConfigLineage.mk
+
+include $(VENDOR_PATH)/BoardConfigVendor.mk
--- a/raven/device-evolution.mk
+++ b/raven/device-evolution.mk
@@ -0,0 +1,8 @@
+#
+# SPDX-FileCopyrightText: 2024 The Evolution X Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+$(call inherit-product, $(DEVICE_PATH)/device-evolution.mk)
+
+DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/$(DEVICE_CODENAME)/overlay-evolution
--- a/raven/device-lineage.mk
+++ b/raven/device-lineage.mk
@@ -0,0 +1,13 @@
+#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# SPDX-License-Identifier: Apache-2.0
+#
+
+$(call inherit-product, $(DEVICE_PATH)/device-lineage.mk)
+
+DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/$(DEVICE_CODENAME)/overlay-lineage
+
+# Init
+PRODUCT_PACKAGES += \
+    init.recovery.raven.touch.rc
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`https://android.googlesource.com/device/google/raviole`
				`@@ -0,0 +1 @@`
				`#!./extract-files.py --regenerate_makefiles`