raviole: Initialize for Evolution X 9.x

Signed-off-by: AnierinB <anierin@evolution-x.org>

Android.mk

@@ -0,0 +1,38 @@
+#
+# 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))

BoardConfigEvolution.mk

@@ -1,4 +0,0 @@
-#
-# SPDX-FileCopyrightText: 2024 The Evolution X Project
-# SPDX-License-Identifier: Apache-2.0
-#

BoardConfigLineage.mk

@@ -1,11 +1,5 @@
 #
-# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
-# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# Copyright (C) 2021 The LineageOS Project
+#
 # 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)))

OWNERS

@@ -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,{**/,}Android.bp=file:device/google/gs-common:main:/MK_OWNERS
+per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/OWNERS

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 := 16384
+PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536

aosp_raven.mk

@@ -15,7 +15,7 @@
 #
 
 $(call inherit-product, device/google/gs101/aosp_common.mk)
-$(call inherit-product, device/google/raviole/raven_generic.mk)
+$(call inherit-product, device/google/raviole/device-raven.mk)
 
 PRODUCT_NAME := aosp_raven
 PRODUCT_NAME_FOR_ATTESTATION := raven

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 := 16384
+PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536

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/slider_generic.mk)
+$(call inherit-product, device/google/raviole/device-slider.mk)
 
 PRODUCT_NAME := aosp_slider
 PRODUCT_DEVICE := slider

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/whitefin_generic.mk)
+$(call inherit-product, device/google/raviole/device-whitefin.mk)
 
 PRODUCT_NAME := aosp_whitefin
 PRODUCT_DEVICE := whitefin

audio/oriole/config/audio_policy_configuration.xml

@@ -135,6 +135,10 @@
                 </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,6 +149,8 @@
                 </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 -->
@@ -152,6 +158,8 @@
                 </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"

audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml

@@ -135,6 +135,10 @@
                 </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,6 +149,8 @@
                 </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 -->
@@ -152,6 +158,8 @@
                 </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">

audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml

@@ -131,6 +131,10 @@
                 </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">
@@ -141,6 +145,8 @@
                 </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 -->
@@ -148,6 +154,8 @@
                 </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">

audio/oriole/config/audio_policy_configuration_le_offload_disabled.xml

@@ -135,6 +135,10 @@
                 </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,6 +149,8 @@
                 </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 -->
@@ -152,6 +158,8 @@
                 </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"

audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml

@@ -11,7 +11,6 @@
                      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"
@@ -52,7 +51,6 @@
         <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"
@@ -68,8 +66,6 @@
         <route type="mix" sink="le audio input"
                sources="BLE Headset In"/>
         <route type="mix" sink="BLE Speaker Out"
-            sources="le audio output"/>
-        <route type="mix" sink="BLE Broadcast Out"
-            sources="le audio broadcast output"/>
+               sources="le audio output"/>
     </routes>
-</module>
+</module>

audio/oriole/tuning/waves/waves_config.ini

@@ -29,6 +29,7 @@ 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.
@@ -37,6 +38,8 @@ SPEAKER_SAFE_CALL = OM:10,SM:2,OST:OST_SPEAKER
 ########################################################################################################
 [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

audio/raven/config/audio_policy_configuration.xml

@@ -135,6 +135,10 @@
                 </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,6 +149,8 @@
                 </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 -->
@@ -152,6 +158,8 @@
                 </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"

audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml

@@ -135,6 +135,10 @@
                 </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,6 +149,8 @@
                 </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 -->
@@ -152,6 +158,8 @@
                 </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">

audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml

@@ -131,6 +131,10 @@
                 </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">
@@ -141,6 +145,8 @@
                 </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 -->
@@ -148,6 +154,8 @@
                 </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">

audio/raven/config/audio_policy_configuration_le_offload_disabled.xml

@@ -135,6 +135,10 @@
                 </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,6 +149,8 @@
                 </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 -->
@@ -152,6 +158,8 @@
                 </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"

audio/raven/config/bluetooth_with_le_audio_policy_configuration_7_0.xml

@@ -11,7 +11,6 @@
                      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"
@@ -52,7 +51,6 @@
         <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"
@@ -68,8 +66,6 @@
         <route type="mix" sink="le audio input"
                sources="BLE Headset In"/>
         <route type="mix" sink="BLE Speaker Out"
-            sources="le audio output"/>
-        <route type="mix" sink="BLE Broadcast Out"
-            sources="le audio broadcast output"/>
+               sources="le audio output"/>
     </routes>
-</module>
+</module>

audio/raven/tuning/waves/waves_config.ini

@@ -29,6 +29,7 @@ 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.
@@ -37,6 +38,8 @@ SPEAKER_SAFE_CALL = OM:10,SM:2,OST:OST_SPEAKER
 ########################################################################################################
 [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

bluetooth/bt_vendor_overlay.conf

@@ -2,7 +2,4 @@
 
 BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus
 
-# Update BQR Event Mask property value
-BqrEventMaskValueUpdate = 262238
-
 BtOpusEnabled = true

conf/init.raviole.rc

@@ -32,7 +32,7 @@ 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_dlkm/etc/init.insmod.${ro.hardware}.cfg
+service insmod_sh_raviole /vendor/bin/insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg
     class main
     user root
     group root system

conf/init.slider.rc

@@ -16,7 +16,7 @@ on early-boot
     start insmod_sh_slider
 
 
-service insmod_sh_slider /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.slider.cfg
+service insmod_sh_slider /vendor/bin/insmod.sh /vendor/etc/init.insmod.slider.cfg
     class main
     user root
     group root system

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_dlkm/etc/init.insmod.whitefin.cfg
+service insmod_sh_whitefin /vendor/bin/insmod.sh /vendor/etc/init.insmod.whitefin.cfg
     class main
     user root
     group root system

device-evolution.mk

@@ -1,7 +1,11 @@
 #
 # Copyright (C) 2024 The Evolution X Project
+#
 # SPDX-License-Identifier: Apache-2.0
 #
 
 # Overlays
-DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay-evolution
+#DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay-evolution
+
+# Udfps
+TARGET_HAS_UDFPS += true

device-lineage.mk

@@ -1,10 +1,11 @@
 #
-# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
-# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# Copyright (C) 2021 The LineageOS Project
+#
 # SPDX-License-Identifier: Apache-2.0
 #
 
-DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/overlay-lineage
+# Overlays
+DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay-lineage
 
 # ANGLE - Almost Native Graphics Layer Engine
 PRODUCT_PACKAGES += \
@@ -14,9 +15,8 @@ PRODUCT_PACKAGES += \
 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
+# Kernel
+TARGET_PREBUILT_KERNEL := device/google/raviole-kernel/Image.lz4
 
 # PowerShare
 include hardware/google/pixel/powershare/device.mk
@@ -34,16 +34,16 @@ PRODUCT_PACKAGES += \
 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
 
+# Identity credential
+PRODUCT_PACKAGES += \
+    android.hardware.identity_credential.xml
+
 # Sensors
 PRODUCT_PACKAGES += \
     sensors.dynamic_sensor_hal

device-oriole.mk

@@ -17,18 +17,17 @@
 # Restrict the visibility of Android.bp files to improve build analysis time
 $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
 
-ifdef RELEASE_GOOGLE_ORIOLE_RADIO_DIR
-RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_ORIOLE_RADIO_DIR)
+TARGET_KERNEL_DIR ?= device/google/raviole-kernel
+TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
+
+ifdef RELEASE_GOOGLE_ORIOLE_KERNEL_VERSION
+TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_ORIOLE_KERNEL_VERSION)
 endif
-RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)
-$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR))
 
-
-TARGET_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
+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
 
 $(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)
@@ -43,11 +42,19 @@ 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)
@@ -69,13 +76,9 @@ 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. 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),)
+# insmod files
 PRODUCT_COPY_FILES += \
-	device/google/raviole/init.insmod.oriole.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.oriole.cfg
-endif
+	device/google/raviole/init.insmod.oriole.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.oriole.cfg
 
 # Thermal Config
 PRODUCT_COPY_FILES += \
@@ -107,9 +110,11 @@ PRODUCT_COPY_FILES += \
 
 
 # Bluetooth Hal Extension test tools
-PRODUCT_PACKAGES_ENG += \
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PACKAGES_DEBUG += \
     sar_test \
     hci_inject
+endif
 
 # userdebug specific
 ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
@@ -159,12 +164,6 @@ 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 \
@@ -220,25 +219,6 @@ endif
 PRODUCT_VENDOR_PROPERTIES += \
     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 += \
     ro.support_hide_display_cutout=true
@@ -275,6 +255,13 @@ 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 += \
@@ -289,8 +276,8 @@ PRODUCT_PACKAGES += \
 	vendor.samsung_slsi.hardware.tetheroffload@1.1-service
 
 # Override default distortion output gain according to UX experiments
-PRODUCT_VENDOR_PROPERTIES += \
-    vendor.audio.hapticgenerator.distortion.output.gain=0.32
+PRODUCT_PRODUCT_PROPERTIES += \
+    vendor.audio.hapticgenerator.distortion.output.gain=0.5
 
 # RKPD
 PRODUCT_PRODUCT_PROPERTIES += \
@@ -324,21 +311,11 @@ PRODUCT_PRODUCT_PROPERTIES += \
 
 # Location
 ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-    ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
         PRODUCT_COPY_FILES += \
-            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
+		device/google/raviole/location/gps.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
 else
-    ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
         PRODUCT_COPY_FILES += \
-            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
+		device/google/raviole/location/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
 endif
 
 # Enable DeviceAsWebcam support
@@ -350,22 +327,6 @@ 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)
+# HBM
+PRODUCT_PACKAGES += \
+    HbmSVManagerOverlay

device-raven.mk

@@ -17,18 +17,17 @@
 # Restrict the visibility of Android.bp files to improve build analysis time
 $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
 
-ifdef RELEASE_GOOGLE_RAVEN_RADIO_DIR
-RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RAVEN_RADIO_DIR)
+TARGET_KERNEL_DIR ?= device/google/raviole-kernel
+TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
+
+ifdef RELEASE_GOOGLE_RAVEN_KERNEL_VERSION
+TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_RAVEN_KERNEL_VERSION)
 endif
-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))
 
-
-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
+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
 
 $(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)
@@ -49,6 +48,13 @@ 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)
@@ -60,6 +66,8 @@ 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)
@@ -77,13 +85,9 @@ 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. 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),)
+# insmod files
 PRODUCT_COPY_FILES += \
-	device/google/raviole/init.insmod.raven.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.raven.cfg
-endif
+	device/google/raviole/init.insmod.raven.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.raven.cfg
 
 # Thermal Config
 PRODUCT_COPY_FILES += \
@@ -118,9 +122,11 @@ 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_ENG += \
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PACKAGES_DEBUG += \
     sar_test \
     hci_inject
+endif
 
 # userdebug specific
 ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
@@ -164,12 +170,6 @@ 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 \
@@ -223,25 +223,6 @@ endif
 PRODUCT_VENDOR_PROPERTIES += \
     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 += \
     ro.support_hide_display_cutout=true
@@ -282,6 +263,13 @@ 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 += \
@@ -296,8 +284,8 @@ PRODUCT_PACKAGES += \
 	vendor.samsung_slsi.hardware.tetheroffload@1.1-service
 
 # Override default distortion output gain according to UX experiments
-PRODUCT_VENDOR_PROPERTIES += \
-    vendor.audio.hapticgenerator.distortion.output.gain=0.32
+PRODUCT_PRODUCT_PROPERTIES += \
+    vendor.audio.hapticgenerator.distortion.output.gain=0.5
 
 # RKPD
 PRODUCT_PRODUCT_PROPERTIES += \
@@ -334,21 +322,11 @@ PRODUCT_PRODUCT_PROPERTIES += \
 
 # Location
 ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-    ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
         PRODUCT_COPY_FILES += \
-            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
+		device/google/raviole/location/gps.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
 else
-    ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
         PRODUCT_COPY_FILES += \
-            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
+		device/google/raviole/location/gps_user.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
 endif
 
 # Enable DeviceAsWebcam support
@@ -358,23 +336,3 @@ 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)

device-slider.mk

@@ -14,13 +14,8 @@
 # limitations under the License.
 #
 
-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
+TARGET_KERNEL_DIR ?= device/google/raviole-kernel
+TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/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)
@@ -31,6 +26,7 @@ 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
@@ -48,13 +44,9 @@ 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. 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),)
+# insmod files
 PRODUCT_COPY_FILES += \
-	device/google/raviole/init.insmod.slider.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.slider.cfg
-endif
+	device/google/raviole/init.insmod.slider.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.slider.cfg
 
 # Thermal Config
 PRODUCT_COPY_FILES += \
@@ -95,12 +87,6 @@ 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
@@ -119,6 +105,13 @@ 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 += \
@@ -144,5 +137,3 @@ 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

device-whitefin.mk

@@ -14,13 +14,8 @@
 # limitations under the License.
 #
 
-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
+TARGET_KERNEL_DIR ?= device/google/raviole-kernel
+TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/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)
@@ -30,6 +25,7 @@ $(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
@@ -52,13 +48,9 @@ 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. 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),)
+# insmod files
 PRODUCT_COPY_FILES += \
-	device/google/raviole/init.insmod.whitefin.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.whitefin.cfg
-endif
+	device/google/raviole/init.insmod.whitefin.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.whitefin.cfg
 
 # Thermal Config
 PRODUCT_COPY_FILES += \
@@ -91,17 +83,18 @@ 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 += \
@@ -127,5 +120,3 @@ 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

evolution.dependencies

@@ -4,21 +4,8 @@
     "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"
+    "repository": "device/google/raviole-kernel",
+    "target_path": "device/google/raviole-kernel",
+    "remote": "aosp-raviole"
   }
 ]

factory_raven.mk

@@ -32,6 +32,3 @@ 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

factory_slider.mk

@@ -23,6 +23,3 @@ 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

factory_whitefin.mk

@@ -29,5 +29,3 @@ 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

lineage_oriole.mk

@@ -1,35 +1,34 @@
 #
-# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
-# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# Copyright (C) 2021 The LineageOS Project
+#
 # SPDX-License-Identifier: Apache-2.0
 #
 
-# Inherit some common Evolution X stuff
+# 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/raviole/aosp_oriole.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)
+
+include device/google/raviole/oriole/device-lineage.mk
+include device/google/raviole/oriole/device-evolution.mk
 
 # Device identifier. This must come after all inclusions
 PRODUCT_BRAND := google
 PRODUCT_MODEL := Pixel 6
-PRODUCT_NAME := lineage_$(DEVICE_CODENAME)
+PRODUCT_NAME := lineage_oriole
 
 # 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)
+    TARGET_PRODUCT=oriole \
+    PRIVATE_BUILD_DESC="oriole-user 14 AP2A.240905.003.F1 12235381 release-keys"
 
-$(call inherit-product, $(VENDOR_PATH)/$(DEVICE_CODENAME)-vendor.mk)
+BUILD_FINGERPRINT := google/oriole/oriole:14/AP2A.240905.003.F1/12235381:user/release-keys
+
+$(call inherit-product, vendor/google/oriole/oriole-vendor.mk)

lineage_raven.mk

@@ -1,35 +1,34 @@
 #
-# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
-# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# Copyright (C) 2021 The LineageOS Project
+#
 # SPDX-License-Identifier: Apache-2.0
 #
 
-# Inherit some common Evolution X stuff
+# 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/raviole/aosp_raven.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)
+
+include device/google/raviole/raven/device-lineage.mk
+include device/google/raviole/raven/device-evolution.mk
 
 # Device identifier. This must come after all inclusions
 PRODUCT_BRAND := google
 PRODUCT_MODEL := Pixel 6 Pro
-PRODUCT_NAME := lineage_$(DEVICE_CODENAME)
+PRODUCT_NAME := lineage_raven
 
 # 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)
+    TARGET_PRODUCT=raven \
+    PRIVATE_BUILD_DESC="raven-user 14 AP2A.240905.003.F1 12235381 release-keys"
 
-$(call inherit-product, $(VENDOR_PATH)/$(DEVICE_CODENAME)-vendor.mk)
+BUILD_FINGERPRINT := google/raven/raven:14/AP2A.240905.003.F1/12235381:user/release-keys
+
+$(call inherit-product, vendor/google/raven/raven-vendor.mk)

location/gps.6.1.xml.oriole

@@ -1,109 +0,0 @@
-<?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>
-

location/gps.6.1.xml.raven

@@ -1,109 +0,0 @@
-<?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>
-

location/gps.xml

@@ -18,7 +18,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23"
+       SuplSslMethod="SSLv23_NO_TLSv1_2"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -35,7 +35,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
+       SuplOtdoaCapable2="false"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
@@ -49,7 +49,6 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
-       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="1"
        CpLppGuardTimeSec="1"
        IgnoreInjectedSystemTime="true"
@@ -57,7 +56,6 @@
        AttributionAppPkgName="com.google.android.carrierlocation"
 
        AssertEnabled="true"
-       ExitOnComFailure="true"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
        ReAidingOnHotStart="false"
@@ -70,7 +68,7 @@
   <gll
        PpsEnable="true"
        LogPriMask="LOG_INFO"
-       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI | LOG_MEASAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
        MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
        MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
@@ -99,8 +97,6 @@
   />
 
   <gll_features
-       EnableQzsAutoSwitch="false"
-       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />

location/gps.xml.oriole

@@ -18,7 +18,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23"
+       SuplSslMethod="SSLv23_NO_TLSv1_2"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -35,7 +35,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
+       SuplOtdoaCapable2="false"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
@@ -49,7 +49,6 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
-       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="1"
        CpLppGuardTimeSec="1"
        IgnoreInjectedSystemTime="true"
@@ -57,7 +56,6 @@
        AttributionAppPkgName="com.google.android.carrierlocation"
 
        AssertEnabled="true"
-       ExitOnComFailure="true"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
        ReAidingOnHotStart="false"
@@ -70,7 +68,7 @@
   <gll
        PpsEnable="true"
        LogPriMask="LOG_INFO"
-       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI | LOG_MEASAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
        MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
        MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
@@ -99,11 +97,8 @@
   />
 
   <gll_features
-       EnableQzsAutoSwitch="false"
-       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
-       ConstellationAutoSwitchOffNavOnly="true"
   />
 
 </glgps>

location/gps.xml.raven

@@ -18,7 +18,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23"
+       SuplSslMethod="SSLv23_NO_TLSv1_2"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -35,7 +35,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
+       SuplOtdoaCapable2="false"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
@@ -49,7 +49,6 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
-       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="1"
        CpLppGuardTimeSec="1"
        IgnoreInjectedSystemTime="true"
@@ -57,7 +56,6 @@
        AttributionAppPkgName="com.google.android.carrierlocation"
 
        AssertEnabled="true"
-       ExitOnComFailure="true"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
        ReAidingOnHotStart="false"
@@ -70,7 +68,7 @@
   <gll
        PpsEnable="true"
        LogPriMask="LOG_INFO"
-       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI | LOG_MEASAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
        MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
        MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
@@ -99,11 +97,8 @@
   />
 
   <gll_features
-       EnableQzsAutoSwitch="false"
-       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
-       ConstellationAutoSwitchOffNavOnly="true"
   />
 
 </glgps>

location/gps_user.6.1.xml.oriole

@@ -1,107 +0,0 @@
-<?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>
-

location/gps_user.6.1.xml.raven

@@ -1,107 +0,0 @@
-<?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>
-

location/gps_user.xml

@@ -17,7 +17,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23"
+       SuplSslMethod="SSLv23_NO_TLSv1_2"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -34,7 +34,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
+       SuplOtdoaCapable2="false"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
@@ -48,7 +48,6 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
-       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="1"
        CpLppGuardTimeSec="1"
        IgnoreInjectedSystemTime="true"
@@ -97,8 +96,6 @@
   />
 
   <gll_features
-       EnableQzsAutoSwitch="false"
-       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />

location/gps_user.xml.oriole

@@ -17,7 +17,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23"
+       SuplSslMethod="SSLv23_NO_TLSv1_2"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -34,7 +34,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
+       SuplOtdoaCapable2="false"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
@@ -48,7 +48,6 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
-       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="1"
        CpLppGuardTimeSec="1"
        IgnoreInjectedSystemTime="true"
@@ -97,11 +96,8 @@
   />
 
   <gll_features
-       EnableQzsAutoSwitch="false"
-       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
-       ConstellationAutoSwitchOffNavOnly="true"
   />
 
 </glgps>

location/gps_user.xml.raven

@@ -17,7 +17,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23"
+       SuplSslMethod="SSLv23_NO_TLSv1_2"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -34,7 +34,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
+       SuplOtdoaCapable2="false"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
@@ -48,7 +48,6 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
-       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="1"
        CpLppGuardTimeSec="1"
        IgnoreInjectedSystemTime="true"
@@ -97,11 +96,8 @@
   />
 
   <gll_features
-       EnableQzsAutoSwitch="false"
-       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
-       ConstellationAutoSwitchOffNavOnly="true"
   />
 
 </glgps>

modules.blocklist.vendor_boot

@@ -1,2 +0,0 @@
-blocklist ftm5
-blocklist sec_touch

modules.load.vendor_boot

@@ -1,2 +0,0 @@
-extra/ftm5.ko
-extra/sec_touch.ko

oriole/Android.bp

@@ -1,11 +0,0 @@
-//
-// 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,
-}

oriole/BoardConfig.mk

@@ -18,12 +18,20 @@
 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
@@ -42,16 +50,6 @@ include device/google/gs101/BoardConfig-common.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
+include device/google/raviole/oriole/BoardConfigLineage.mk

oriole/BoardConfigEvolution.mk

@@ -1,6 +0,0 @@
-#
-# SPDX-FileCopyrightText: 2024 The Evolution X Project
-# SPDX-License-Identifier: Apache-2.0
-#
-
-include $(DEVICE_PATH)/BoardConfigEvolution.mk

oriole/BoardConfigLineage.mk

@@ -1,9 +1,9 @@
 #
-# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
-# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# Copyright (C) 2021 The LineageOS Project
+#
 # SPDX-License-Identifier: Apache-2.0
 #
 
-include $(DEVICE_PATH)/BoardConfigLineage.mk
+include device/google/raviole/BoardConfigLineage.mk
 
-include $(VENDOR_PATH)/BoardConfigVendor.mk
+include vendor/google/oriole/BoardConfigVendor.mk

oriole/device-evolution.mk

@@ -1,8 +1,9 @@
 #
-# SPDX-FileCopyrightText: 2024 The Evolution X Project
+# Copyright (C) 2024 The Evolution X Project
+#
 # SPDX-License-Identifier: Apache-2.0
 #
 
-$(call inherit-product, $(DEVICE_PATH)/device-evolution.mk)
+DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/oriole/overlay-evolution
 
-DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/$(DEVICE_CODENAME)/overlay-evolution
+$(call inherit-product, $(LOCAL_PATH)/device-evolution.mk)

oriole/device-lineage.mk

@@ -1,17 +1,9 @@
 #
-# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
-# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# Copyright (C) 2022 The LineageOS Project
+#
 # SPDX-License-Identifier: Apache-2.0
 #
 
-$(call inherit-product, $(DEVICE_PATH)/device-lineage.mk)
+DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/oriole/overlay-lineage
 
-DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/$(DEVICE_CODENAME)/overlay-lineage
-
-# HBM
-PRODUCT_PACKAGES += \
-    HbmSVManagerOverlay
-
-# Init
-PRODUCT_PACKAGES += \
-    init.recovery.oriole.touch.rc
+$(call inherit-product, $(LOCAL_PATH)/device-lineage.mk)

oriole/extract-files.py

@@ -1,107 +0,0 @@
-#!/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()

oriole/extract-files.sh

@@ -0,0 +1,149 @@
+#!/bin/bash
+#
+# SPDX-FileCopyrightText: 2016 The CyanogenMod Project
+# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set -e
+
+DEVICE=oriole
+VENDOR=google
+
+# Load extract_utils and do some sanity checks
+MY_DIR="${BASH_SOURCE%/*}"
+if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
+
+ANDROID_ROOT="${MY_DIR}/../../../.."
+
+export TARGET_ENABLE_CHECKELF=true
+
+# If XML files don't have comments before the XML header, use this flag
+# Can still be used with broken XML files by using blob_fixup
+export TARGET_DISABLE_XML_FIXING=true
+
+HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
+if [ ! -f "${HELPER}" ]; then
+    echo "Unable to find helper script at ${HELPER}"
+    exit 1
+fi
+source "${HELPER}"
+
+# Default to sanitizing the vendor folder before extraction
+CLEAN_VENDOR=true
+
+ONLY_FIRMWARE=
+KANG=
+SECTION=
+CARRIER_SKIP_FILES=()
+VENDOR_SKIP_FILES=()
+
+while [ "${#}" -gt 0 ]; do
+    case "${1}" in
+        --only-firmware)
+            ONLY_FIRMWARE=true
+            ;;
+        -n | --no-cleanup)
+            CLEAN_VENDOR=false
+            ;;
+        -k | --kang)
+            KANG="--kang"
+            ;;
+        -s | --section)
+            SECTION="${2}"
+            shift
+            CLEAN_VENDOR=false
+            ;;
+        *)
+            SRC="${1}"
+            ;;
+    esac
+    shift
+done
+
+if [ -z "${SRC}" ]; then
+    SRC="adb"
+fi
+
+function blob_fixup() {
+    case "${1}" in
+        product/etc/felica/common.cfg)
+            [ "$2" = "" ] && return 0
+            sed -i -e '$a00000018,1' -e '/^00000014/d' -e '/^00000015/d' "${2}"
+            ;;
+        vendor/etc/init/init.modem_logging_control.rc)
+            [ "$2" = "" ] && return 0
+            sed -i 's/ && property:ro.debuggable=0//' "${2}"
+            ;;
+        *)
+            return 1
+            ;;
+    esac
+
+    return 0
+}
+
+function blob_fixup_dry() {
+    blob_fixup "$1" ""
+}
+
+function prepare_firmware() {
+    if [ "${SRC}" != "adb" ]; then
+        bash "${ANDROID_ROOT}"/lineage/scripts/pixel/prepare-firmware.sh "${DEVICE}" "${SRC}"
+    fi
+}
+
+# Initialize the helper
+setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false "${CLEAN_VENDOR}"
+
+if [ -z "${ONLY_FIRMWARE}" ]; then
+    extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}"
+
+    generate_prop_list_from_image "product.img" "${MY_DIR}/proprietary-files-carriersettings.txt" CARRIER_SKIP_FILES carriersettings
+    extract "${MY_DIR}/proprietary-files-carriersettings.txt" "${SRC}" "${KANG}" --section "${SECTION}"
+
+    readarray -t VENDOR_SKIP_FILES < <(cat "${MY_DIR}/skip-files-vendor.txt" | sed -E "/^[[:blank:]]*(#|$)/d")
+    VENDOR_TXT="${MY_DIR}/proprietary-files-vendor.txt"
+    generate_prop_list_from_image "vendor.img" "${VENDOR_TXT}" VENDOR_SKIP_FILES
+
+    # flp.default & gps.default have incorrect SONAME
+    # libExynosC2*Dec & libExynosC2*Enc depend on libacryl & libexynosv4l2, which are gnu makefile targets
+    set_disable_checkelf "vendor/lib/libExynosC2H263Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib/libExynosC2H263Enc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib/libExynosC2H264Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib/libExynosC2H264Enc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib/libExynosC2HevcDec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib/libExynosC2HevcEnc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib/libExynosC2Mpeg4Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib/libExynosC2Mpeg4Enc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib/libExynosC2Vp8Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib/libExynosC2Vp8Enc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib/libExynosC2Vp9Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib/libExynosC2Vp9Enc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/hw/flp.default.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/hw/gps.default.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2H263Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2H263Enc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2H264Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2H264Enc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2HevcDec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2HevcEnc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2Mpeg4Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2Mpeg4Enc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2Vp8Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2Vp8Enc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2Vp9Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2Vp9Enc.so" "${VENDOR_TXT}"
+
+    set_module_suffix "vendor/lib/com.google.edgetpu_app_service-V3-ndk.so" "-vendor" "${VENDOR_TXT}"
+    set_module_suffix "vendor/lib64/com.google.edgetpu_app_service-V3-ndk.so" "-vendor" "${VENDOR_TXT}"
+    set_module_suffix "vendor/lib64/com.google.edgetpu_vendor_service-V2-ndk.so" "-vendor" "${VENDOR_TXT}"
+
+    extract "${MY_DIR}/proprietary-files-vendor.txt" "${SRC}" "${KANG}" --section "${SECTION}"
+fi
+
+if [ -z "${SECTION}" ]; then
+    extract_firmware "${MY_DIR}/proprietary-firmware.txt" "${SRC}"
+fi
+
+"${MY_DIR}/setup-makefiles.sh"

oriole/init.recovery.touch.rc

@@ -1,2 +0,0 @@
-on init
-   insmod /lib/modules/ftm5.ko

oriole/osaifu-keitai.patch

@@ -1,24 +0,0 @@
-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
-

oriole/overlay/frameworks/base/core/res/res/values/dimens.xml

@@ -16,7 +16,7 @@
 */
 -->
 <resources>
-    <!-- Default paddings for content around the corners. -->
-    <dimen name="rounded_corner_content_padding">14dp</dimen>
+   <!-- for 20dp of padding at 3.5px/dp at default density -->
+    <dimen name="rounded_corner_content_padding">50px</dimen>
 </resources>
 

oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml

@@ -16,20 +16,24 @@
 */
 -->
 <resources>
-    <!-- the padding on the start of the statusbar -->
+    <!-- Don't need the left side padding due to being inset from the cutout -->
     <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_default</dimen>
+    <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height</dimen>
 
-    <!-- Margin on the left side of the carrier text on Keyguard -->
-    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</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>
 
-    <!--  Total minimum padding to enforce to ensure that the dot can always show  -->
-    <dimen name="ongoing_appops_dot_min_padding">14dp</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>
 
     <dimen name="config_rounded_mask_size">71px</dimen>
     <dimen name="config_rounded_mask_size_top">71px</dimen>
@@ -42,6 +46,7 @@
     <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>
 

oriole/proprietary-files-carriersettings.txt

@@ -1,8 +1,6 @@
 # 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
@@ -10,13 +8,9 @@ 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
@@ -24,14 +18,12 @@ 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
@@ -57,11 +49,7 @@ 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
@@ -76,7 +64,6 @@ 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
@@ -85,20 +72,15 @@ 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
@@ -108,7 +90,7 @@ 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/fi_us.pb
 product/etc/CarrierSettings/fido_ca.pb
 product/etc/CarrierSettings/finetwork_es.pb
 product/etc/CarrierSettings/firstnet_us.pb
@@ -116,10 +98,7 @@ 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
@@ -128,8 +107,6 @@ 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
@@ -137,7 +114,6 @@ 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
@@ -145,15 +121,9 @@ 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
@@ -161,7 +131,6 @@ 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
@@ -171,33 +140,18 @@ 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
@@ -208,12 +162,9 @@ 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
@@ -231,24 +182,18 @@ 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/reachmobileatt_us.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
@@ -265,47 +210,34 @@ 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
@@ -317,18 +249,15 @@ 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
@@ -336,21 +265,15 @@ 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
@@ -372,7 +295,6 @@ 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
@@ -380,7 +302,6 @@ 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
@@ -390,8 +311,6 @@ 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
@@ -401,7 +320,6 @@ 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
@@ -410,12 +328,10 @@ 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
@@ -425,4 +341,3 @@ 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

oriole/proprietary-files.txt

@@ -3,15 +3,14 @@
 # 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
+product/priv-app/DeviceIntelligenceNetworkPrebuilt-v.U.14.playstore/DeviceIntelligenceNetworkPrebuilt-v.U.14.playstore.apk;PRESIGNED
+product/priv-app/DevicePersonalizationPrebuiltPixel2021-v.U.14.playstore/DevicePersonalizationPrebuiltPixel2021-v.U.14.playstore.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
@@ -20,11 +19,6 @@ product/priv-app/GoogleCamera/GoogleCamera.apk;OVERRIDES=Aperture,Camera2;PRESIG
 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
@@ -36,8 +30,8 @@ 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
+product/priv-app/HotwordEnrollmentOKGoogleFUSION/HotwordEnrollmentOKGoogleFUSION.apk;PRESIGNED
+product/priv-app/HotwordEnrollmentXGoogleFUSION/HotwordEnrollmentXGoogleFUSION.apk;PRESIGNED
 
 # IMS
 product/etc/sysconfig/allowlist_com.shannon.imsservice.xml
@@ -64,7 +58,7 @@ product/lib/libdmengine.so;SYMLINK=product/priv-app/DMService/lib/arm/libdmengin
 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/CarrierSettings_signed_45.0.591154042/CarrierSettings_signed_45.0.591154042.apk;PRESIGNED
 product/priv-app/CarrierWifi/CarrierWifi.apk;PRESIGNED
 product/priv-app/ConnMO/ConnMO.apk
 product/priv-app/DCMO/DCMO.apk
@@ -85,11 +79,6 @@ 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
@@ -100,23 +89,15 @@ 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/lib/libedgetpu_dba.google.so
 system_ext/lib64/com.google.edgetpu_app_service-V3-ndk.so
 system_ext/lib64/com.google.edgetpu_vendor_service-V2-ndk.so
+system_ext/lib64/libedgetpu_dba.google.so
 
 # HBM
 system_ext/lib64/libhbmsvmanager_jni.so;SYMLINK=system_ext/priv-app/HbmSVManager/lib/arm64/libhbmsvmanager_jni.so
@@ -136,11 +117,6 @@ 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
 
@@ -160,8 +136,6 @@ 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

oriole/rro_overlays/NfcOverlay/res/values/config.xml

@@ -30,7 +30,7 @@
     <item>36</item>
   </integer-array>
   <integer-array name="antenna_y">
-    <item>51</item>
+    <item>106</item>
   </integer-array>
   <bool name="nfc_observe_mode_supported">true</bool>
 </resources>

oriole/setup-makefiles.py

@@ -1 +0,0 @@
-#!./extract-files.py --regenerate_makefiles

oriole/setup-makefiles.sh

@@ -0,0 +1,82 @@
+#!/bin/bash
+#
+# SPDX-FileCopyrightText: 2016 The CyanogenMod Project
+# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set -e
+
+DEVICE=oriole
+VENDOR=google
+
+# Load extract_utils and do some sanity checks
+MY_DIR="${BASH_SOURCE%/*}"
+if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
+
+ANDROID_ROOT="${MY_DIR}/../../../.."
+
+export TARGET_ENABLE_CHECKELF=true
+
+HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
+if [ ! -f "${HELPER}" ]; then
+    echo "Unable to find helper script at ${HELPER}"
+    exit 1
+fi
+source "${HELPER}"
+
+function vendor_imports() {
+    cat <<EOF >>"$1"
+		"device/google/raviole",
+		"hardware/google/av",
+		"hardware/google/gchips",
+		"hardware/google/graphics/common",
+		"hardware/google/interfaces",
+		"hardware/google/pixel",
+EOF
+}
+
+function lib_to_package_fixup_vendor_variants() {
+    if [ "$2" != "vendor" ]; then
+        return 1
+    fi
+
+    case "$1" in
+        com.google.edgetpu_app_service-V3-ndk | \
+            com.google.edgetpu_vendor_service-V2-ndk)
+            echo "$1-vendor"
+            ;;
+        libprotobuf-cpp-full-21.12)
+            echo "libprotobuf-cpp-full"
+            ;;
+        libprotobuf-cpp-lite-21.12)
+            echo "libprotobuf-cpp-lite"
+            ;;
+        libacryl | \
+            libexynosv4l2) ;;
+        *)
+            return 1
+            ;;
+    esac
+}
+
+function lib_to_package_fixup() {
+    lib_to_package_fixup_clang_rt_ubsan_standalone "$1" ||
+        lib_to_package_fixup_proto_3_9_1 "$1" ||
+        lib_to_package_fixup_vendor_variants "$@"
+}
+
+# Initialize the helper
+setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}"
+
+# Warning headers and guards
+write_headers
+
+write_makefiles "${MY_DIR}/proprietary-files.txt"
+write_makefiles "${MY_DIR}/proprietary-files-carriersettings.txt"
+write_makefiles "${MY_DIR}/proprietary-files-vendor.txt"
+
+append_firmware_calls_to_makefiles "${MY_DIR}/proprietary-firmware.txt"
+
+# Finish
+write_footers

oriole/skip-files-vendor.txt

@@ -1,10 +1,11 @@
 # Standard build output with vendor image build enabled
+apex/com.android.hardware.cas.apex
+apex/com.android.vndk.current.on_vendor.apex
 bin/[
 bin/acpi
 bin/awk
 bin/base64
 bin/basename
-bin/blkdiscard
 bin/blockdev
 bin/boringssl_self_test32
 bin/boringssl_self_test64
@@ -38,12 +39,11 @@ bin/du
 bin/dump/dump_aoc
 bin/dump/dump_devfreq
 bin/dump/dump_display
-bin/dump/dump_fingerprint
-bin/dump/dump_modem
+bin/dump/dump_gs101.sh
+bin/dump/dump_modem.sh
 bin/dump/dump_modemlog
 bin/dump/dump_perf
 bin/dump/dump_pixel_metrics
-bin/dump/dump_power
 bin/dump/dump_sensors
 bin/dump/dump_soc
 bin/dump/dump_stm.sh
@@ -69,7 +69,6 @@ bin/getconf
 bin/getenforce
 bin/getevent
 bin/getfattr
-bin/getopt
 bin/getprop
 bin/gpiodetect
 bin/gpiofind
@@ -89,7 +88,7 @@ bin/hw/android.hardware.cas@1.2-service
 bin/hw/android.hardware.drm-service.clearkey
 bin/hw/android.hardware.dumpstate-service
 bin/hw/android.hardware.gatekeeper-service.trusty
-bin/hw/android.hardware.graphics.allocator-V2-service
+bin/hw/android.hardware.graphics.allocator-V1-service
 bin/hw/android.hardware.graphics.composer@2.4-service
 bin/hw/android.hardware.health-service.gs101
 bin/hw/android.hardware.health.storage-service.default
@@ -105,6 +104,7 @@ bin/hw/android.hardware.sensors-service.multihal
 bin/hw/android.hardware.thermal-service.pixel
 bin/hw/android.hardware.usb-service.gs101
 bin/hw/android.hardware.usb.gadget-service.gs101
+bin/hw/android.hardware.vibrator-service.cs40l25
 bin/hw/android.hardware.wifi-service
 bin/hw/disable_contaminant_detection.sh
 bin/hw/hostapd
@@ -261,11 +261,10 @@ etc/NOTICE.xml.gz
 etc/a2dp_audio_policy_configuration_7_0.xml
 etc/a2dp_in_audio_policy_configuration_7_0.xml
 etc/aconfig_flags.pb
-etc/aidl/hfp/hfp_codec_capabilities.xml
 etc/aidl/le_audio/aidl_audio_set_configurations.bfbs
+etc/aidl/le_audio/aidl_audio_set_configurations.json
 etc/aidl/le_audio/aidl_audio_set_scenarios.bfbs
-etc/aidl/le_audio/aidl_default_audio_set_configurations.json
-etc/aidl/le_audio/aidl_default_audio_set_scenarios.json
+etc/aidl/le_audio/aidl_audio_set_scenarios.json
 etc/aoc/BLUETOOTH.dat
 etc/aoc/HANDSET.dat
 etc/aoc/HANDSFREE.dat
@@ -292,7 +291,6 @@ etc/boringssl_self_test.no_zygote.rc
 etc/boringssl_self_test.zygote32.rc
 etc/boringssl_self_test.zygote64.rc
 etc/boringssl_self_test.zygote64_32.rc
-etc/bpf/filterPowerSupplyEvents.o
 etc/build_flags.json
 etc/default_volume_tables.xml
 etc/display_colordata_cal0.pb
@@ -320,13 +318,14 @@ etc/gnss/scd.conf
 etc/group
 etc/hearing_aid_audio_policy_configuration_7_0.xml
 etc/init.common.cfg
+etc/init.insmod.oriole.cfg
 etc/init/android.hardware.audio.service.rc
 etc/init/android.hardware.boot-service.default-pixel.rc
 etc/init/android.hardware.cas@1.2-service.rc
 etc/init/android.hardware.drm-service.clearkey.rc
 etc/init/android.hardware.dumpstate-service.rc
 etc/init/android.hardware.gatekeeper-service.trusty.rc
-etc/init/android.hardware.graphics.allocator2-aidl-service.rc
+etc/init/android.hardware.graphics.allocator-aidl-service.rc
 etc/init/android.hardware.graphics.composer@2.4-service.rc
 etc/init/android.hardware.health-service.gs101.rc
 etc/init/android.hardware.media.omx@1.0-service.rc
@@ -339,30 +338,22 @@ etc/init/android.hardware.sensors-service-multihal.rc
 etc/init/android.hardware.thermal-service.pixel.rc
 etc/init/android.hardware.usb-service.rc
 etc/init/android.hardware.usb.gadget-service.rc
+etc/init/android.hardware.vibrator-service.cs40l25.rc
 etc/init/android.hardware.wifi-service.rc
 etc/init/android.hardware.wifi.supplicant-service.rc
 etc/init/atrace_categories.rc
 etc/init/boringssl_self_test.rc
-etc/init/dump_power.rc
 etc/init/gpu_probe.rc
 etc/init/health-storage-default.rc
 etc/init/hostapd.android.rc
 etc/init/hw/init.gs101.rc
-etc/init/hw/init.gs101.storage.rc
 etc/init/hw/init.gs101.usb.rc
 etc/init/hw/init.oriole.rc
 etc/init/hw/init.raviole.rc
 etc/init/init.aoc.rc
-etc/init/init.fingerprint.dump.rc
 etc/init/init.module.rc
-etc/init/init.pixel-mm-gs.rc
-etc/init/init.pixel-perf.rc
 etc/init/init.pixel.rc
-etc/init/init.power-gs.rc
 etc/init/init.storage.rc
-etc/init/libg3a_gabc.rc
-etc/init/libg3a_gaf.rc
-etc/init/libg3a_ghawb.rc
 etc/init/memtrack.rc
 etc/init/nfc-service-default.rc
 etc/init/pixel-mm-gki.rc
@@ -371,9 +362,6 @@ etc/init/pixelstats-vendor.gs101.rc
 etc/init/pkvm_experiment.rc
 etc/init/rebalance_interrupts-vendor.gs101.rc
 etc/init/vndservicemanager.rc
-etc/libg3a_standalone_gabc_rc
-etc/libg3a_standalone_gaf_rc
-etc/libg3a_standalone_ghawb_rc
 etc/libnfc-hal-st.conf
 etc/libse-gto-hal.conf
 etc/libse-gto-hal2.conf
@@ -419,7 +407,7 @@ etc/permissions/android.hardware.camera.full.xml
 etc/permissions/android.hardware.camera.raw.xml
 etc/permissions/android.hardware.context_hub.xml
 etc/permissions/android.hardware.device_unique_attestation.xml
-etc/permissions/android.hardware.hardware_keystore_V3.xml
+etc/permissions/android.hardware.hardware_keystore.xml
 etc/permissions/android.hardware.keystore.app_attest_key.xml
 etc/permissions/android.hardware.location.gps.prebuilt.xml
 etc/permissions/android.hardware.nfc.ese.xml
@@ -452,6 +440,7 @@ etc/permissions/android.hardware.wifi.direct.xml
 etc/permissions/android.hardware.wifi.passpoint.xml
 etc/permissions/android.hardware.wifi.rtt.xml
 etc/permissions/android.hardware.wifi.xml
+etc/permissions/android.software.contextualsearch.xml
 etc/permissions/android.software.device_id_attestation.xml
 etc/permissions/android.software.ipsec_tunnel_migration.xml
 etc/permissions/android.software.ipsec_tunnels.xml
@@ -461,7 +450,6 @@ etc/permissions/android.software.verified_boot.xml
 etc/permissions/android.software.vulkan.deqp.level.xml
 etc/permissions/aosp_excluded_hardware.xml
 etc/permissions/com.nxp.mifare.xml
-etc/permissions/features_com.android.virt.xml
 etc/permissions/handheld_core_hardware.xml
 etc/permissions/vendor.android.hardware.camera.preview-dis.xml
 etc/powerhint-mainline.json
@@ -469,7 +457,6 @@ etc/powerhint.json
 etc/powerhint_a0.json
 etc/powerhint_a1.json
 etc/r_submix_audio_policy_configuration.xml
-etc/selinux/genfs_labels_version.txt
 etc/selinux/plat_pub_versioned.cil
 etc/selinux/plat_sepolicy_vers.txt
 etc/selinux/precompiled_sepolicy
@@ -479,7 +466,6 @@ etc/selinux/precompiled_sepolicy.system_ext_sepolicy_and_mapping.sha256
 etc/selinux/selinux_denial_metadata
 etc/selinux/vendor_file_contexts
 etc/selinux/vendor_hwservice_contexts
-etc/selinux/vendor_keystore2_key_contexts
 etc/selinux/vendor_mac_permissions.xml
 etc/selinux/vendor_property_contexts
 etc/selinux/vendor_seapp_contexts
@@ -508,13 +494,13 @@ etc/vintf/manifest/android.hardware.sensors-multihal.xml
 etc/vintf/manifest/android.hardware.thermal-service.pixel.xml
 etc/vintf/manifest/android.hardware.usb-service.xml
 etc/vintf/manifest/android.hardware.usb.gadget-service.xml
+etc/vintf/manifest/android.hardware.vibrator-service.cs40l25.xml
 etc/vintf/manifest/android.hardware.wifi-service.xml
 etc/vintf/manifest/android.hardware.wifi.hostapd.xml
 etc/vintf/manifest/android.hardware.wifi.supplicant.xml
 etc/vintf/manifest/bluetooth_audio.xml
 etc/vintf/manifest/health-storage-default.xml
-etc/vintf/manifest/manifest.xml
-etc/vintf/manifest/manifest_gralloc_aidl2.xml
+etc/vintf/manifest/manifest_gralloc_aidl.xml
 etc/vintf/manifest/memtrack.xml
 etc/vintf/manifest/nfc-service-default.xml
 etc/vintf/manifest/pixel-display-default.xml
@@ -535,7 +521,7 @@ firmware/cs35l41-dsp1-spk-prot.bin
 firmware/cs35l41-dsp1-spk-prot.wmfw
 firmware/readme.md
 lib/android.frameworks.stats-V2-ndk.so
-lib/android.hardware.audio.common-V4-ndk.so
+lib/android.hardware.audio.common-V3-ndk.so
 lib/android.hardware.audio.common-util.so
 lib/android.hardware.audio.common@2.0.so
 lib/android.hardware.audio.common@5.0.so
@@ -549,7 +535,7 @@ lib/android.hardware.audio.effect@7.0.so
 lib/android.hardware.audio@7.0.so
 lib/android.hardware.audio@7.1-util.so
 lib/android.hardware.audio@7.1.so
-lib/android.hardware.bluetooth.audio-V5-ndk.so
+lib/android.hardware.bluetooth.audio-V4-ndk.so
 lib/android.hardware.bluetooth.audio-impl.so
 lib/android.hardware.bluetooth.audio@2.0.so
 lib/android.hardware.bluetooth.audio@2.1.so
@@ -560,18 +546,18 @@ lib/android.hardware.cas@1.2.so
 lib/android.hardware.common-V2-ndk.so
 lib/android.hardware.common.fmq-V1-ndk.so
 lib/android.hardware.drm-V1-ndk.so
-lib/android.hardware.drm.common-V1-ndk.so
 lib/android.hardware.graphics.allocator-V2-ndk.so
 lib/android.hardware.graphics.allocator@2.0.so
 lib/android.hardware.graphics.allocator@3.0.so
 lib/android.hardware.graphics.allocator@4.0.so
 lib/android.hardware.graphics.bufferqueue@1.0.so
 lib/android.hardware.graphics.bufferqueue@2.0.so
-lib/android.hardware.graphics.common-V6-ndk.so
+lib/android.hardware.graphics.common-V3-ndk.so
+lib/android.hardware.graphics.common-V5-ndk.so
 lib/android.hardware.graphics.common@1.0.so
 lib/android.hardware.graphics.common@1.1.so
 lib/android.hardware.graphics.common@1.2.so
-lib/android.hardware.graphics.composer3-V4-ndk.so
+lib/android.hardware.graphics.composer3-V3-ndk.so
 lib/android.hardware.graphics.composer@2.1.so
 lib/android.hardware.graphics.composer@2.2.so
 lib/android.hardware.graphics.composer@2.3.so
@@ -597,12 +583,13 @@ lib/android.hidl.memory@1.0.so
 lib/android.hidl.safe_union@1.0.so
 lib/android.hidl.token@1.0-utils.so
 lib/android.hidl.token@1.0.so
-lib/android.media.audio.common.types-V4-ndk.so
+lib/android.media.audio.common.types-V3-ndk.so
 lib/android.system.suspend-V1-ndk.so
 lib/arm.graphics-V1-ndk.so
-lib/com.google.hardware.pixel.display-V13-ndk.so
+lib/com.google.hardware.pixel.display-V10-ndk.so
 lib/hw/android.hardware.audio.effect@7.0-impl.so
 lib/hw/android.hardware.audio@7.1-impl.so
+lib/hw/android.hardware.graphics.mapper@4.0-impl.so
 lib/hw/android.hardware.soundtrigger@2.3-impl.so
 lib/hw/android.hidl.memory@1.0-impl.so
 lib/hw/audio.bluetooth.default.so
@@ -613,12 +600,9 @@ lib/hw/audio.usbv2.default.so
 lib/hw/gralloc.default.so
 lib/hw/hwcomposer.gs101.so
 lib/hw/local_time.default.so
-lib/hw/mapper.pixel.so
 lib/hw/power.default.so
 lib/hw/vibrator.default.so
 lib/libExynosHWCService.so
-lib/libOpenCL.so
-lib/libaconfig_storage_read_api_cc.so
 lib/libacryl.so
 lib/libacryl_hdr_plugin.so
 lib/libalsautils.so
@@ -682,8 +666,6 @@ lib/libxml2.so
 lib/libz.so
 lib/mediacas/libclearkeycasplugin.so
 lib/mediadrm/libdrmclearkeyplugin.so
-lib/modules/6lowpan.ko
-lib/modules/8021q.ko
 lib/modules/abrolhos.ko
 lib/modules/acpm_flexpmu_dbg.ko
 lib/modules/acpm_mbox_test.ko
@@ -693,59 +675,38 @@ lib/modules/aoc_channel_dev.ko
 lib/modules/aoc_char_dev.ko
 lib/modules/aoc_control_dev.ko
 lib/modules/aoc_core.ko
-lib/modules/aoc_tbn_service_dev.ko
-lib/modules/aoc_unit_test_dev.ko
 lib/modules/aoc_usb_driver.ko
 lib/modules/aoc_uwb_platform_drv.ko
 lib/modules/aoc_uwb_service_dev.ko
-lib/modules/aqc111.ko
+lib/modules/arm-memlat-mon.ko
 lib/modules/arm_dsu_pmu.ko
-lib/modules/asix.ko
 lib/modules/at24.ko
 lib/modules/audiometrics.ko
-lib/modules/ax88179_178a.ko
-lib/modules/bbd_pps_gpio.ko
 lib/modules/bc_max77759.ko
 lib/modules/bcm47765.ko
 lib/modules/bcm_dbg.ko
 lib/modules/bcmdhd4389.ko
-lib/modules/bigwave.ko
-lib/modules/bluetooth.ko
+lib/modules/bigocean.ko
 lib/modules/boot_control_sysfs.ko
 lib/modules/boot_device_spi.ko
-lib/modules/bsd_comp.ko
-lib/modules/btbcm.ko
-lib/modules/btqca.ko
 lib/modules/bts.ko
-lib/modules/btsdio.ko
-lib/modules/can-bcm.ko
-lib/modules/can-dev.ko
-lib/modules/can-gw.ko
-lib/modules/can-raw.ko
-lib/modules/can.ko
-lib/modules/cdc-acm.ko
-lib/modules/cdc_eem.ko
-lib/modules/cdc_ether.ko
-lib/modules/cdc_ncm.ko
-lib/modules/cfg80211.ko
-lib/modules/cl_dsp-core.ko
-lib/modules/clk_exynos_gs.ko
+lib/modules/clk_exynos.ko
 lib/modules/cmupmucal.ko
+lib/modules/coresight-etm4x.ko
+lib/modules/coresight-funnel.ko
+lib/modules/coresight-replicator.ko
+lib/modules/coresight-tmc.ko
+lib/modules/coresight.ko
 lib/modules/cp_thermal_zone.ko
 lib/modules/cpif.ko
 lib/modules/cpif_page.ko
-lib/modules/cs40l26-core.ko
-lib/modules/cs40l26-i2c.ko
 lib/modules/dbgcore-dump.ko
 lib/modules/debug-reboot.ko
 lib/modules/debug-snapshot-debug-kinfo.ko
 lib/modules/debug-snapshot-qd.ko
 lib/modules/debug-snapshot-sfrdump.ko
-lib/modules/diag.ko
-lib/modules/drm_display_helper.ko
 lib/modules/drv2624.ko
 lib/modules/dss.ko
-lib/modules/dw3000-core-tests.ko
 lib/modules/dw3000.ko
 lib/modules/dwc3-exynos-usb.ko
 lib/modules/ect_parser.ko
@@ -761,7 +722,6 @@ lib/modules/exynos-cpuhp.ko
 lib/modules/exynos-cpupm.ko
 lib/modules/exynos-debug-test.ko
 lib/modules/exynos-dm.ko
-lib/modules/exynos-drm-audio.ko
 lib/modules/exynos-drm.ko
 lib/modules/exynos-ecc-handler.ko
 lib/modules/exynos-pd-dbg.ko
@@ -770,6 +730,7 @@ lib/modules/exynos-pd_el3.ko
 lib/modules/exynos-pd_hsi0.ko
 lib/modules/exynos-pm.ko
 lib/modules/exynos-pmu-if.ko
+lib/modules/exynos-reboot.ko
 lib/modules/exynos-seclog.ko
 lib/modules/exynos_devfreq.ko
 lib/modules/exynos_dit.ko
@@ -779,7 +740,6 @@ lib/modules/exynos_pm_qos.ko
 lib/modules/exynos_tty.ko
 lib/modules/exyswd-rng.ko
 lib/modules/fips140.ko
-lib/modules/ftdi_sio.ko
 lib/modules/ftm5.ko
 lib/modules/g2d.ko
 lib/modules/goodixfp.ko
@@ -789,50 +749,33 @@ lib/modules/google-bms.ko
 lib/modules/google-charger.ko
 lib/modules/google-cpm.ko
 lib/modules/google_bcl.ko
-lib/modules/google_ccd.ko
 lib/modules/google_dock.ko
 lib/modules/google_dual_batt_gauge.ko
-lib/modules/google_tcpci_shim.ko
+lib/modules/governor_memlat.ko
 lib/modules/gpu_cooling.ko
 lib/modules/gs-chipid.ko
-lib/modules/gs-drm-connector.ko
-lib/modules/gs-panel.ko
 lib/modules/gs101_spmic_thermal.ko
 lib/modules/gs_acpm.ko
-lib/modules/gs_governor_memlat.ko
-lib/modules/gs_governor_utils.ko
-lib/modules/gs_perf_mon.ko
 lib/modules/gs_thermal.ko
 lib/modules/gsa.ko
 lib/modules/gsa_gsc.ko
 lib/modules/gsc-spi.ko
 lib/modules/gvotable.ko
-lib/modules/gzvm.ko
 lib/modules/haptics-cs40l2x.ko
 lib/modules/hardlockup-debug.ko
 lib/modules/hardlockup-watchdog.ko
-lib/modules/hci_uart.ko
 lib/modules/heatmap.ko
-lib/modules/hidp.ko
 lib/modules/i2c-acpm.ko
 lib/modules/i2c-dev.ko
 lib/modules/i2c-exynos5.ko
-lib/modules/ieee802154.ko
-lib/modules/ieee802154_6lowpan.ko
-lib/modules/ieee802154_socket.ko
 lib/modules/itmon.ko
 lib/modules/kernel-top.ko
 lib/modules/keycombo.ko
 lib/modules/keydebug.ko
-lib/modules/kheaders.ko
-lib/modules/l2tp_core.ko
-lib/modules/l2tp_ppp.ko
-lib/modules/libarc4.ko
-lib/modules/ln8411.ko
 lib/modules/logbuffer.ko
 lib/modules/lwis.ko
-lib/modules/mac80211.ko
-lib/modules/mac802154.ko
+lib/modules/lzo-rle.ko
+lib/modules/lzo.ko
 lib/modules/mailbox-wc.ko
 lib/modules/mali_kbase.ko
 lib/modules/mali_kutf.ko
@@ -843,72 +786,44 @@ lib/modules/max20339.ko
 lib/modules/max77729-pmic.ko
 lib/modules/max77729_charger.ko
 lib/modules/max77729_uic.ko
-lib/modules/max77759-charger.ko
+lib/modules/max77759_charger.ko
 lib/modules/max77759_contaminant.ko
 lib/modules/max77759_helper.ko
-lib/modules/max77779-charger-i2c.ko
-lib/modules/max77779-charger.ko
-lib/modules/max77779-fg-i2c.ko
-lib/modules/max77779-fg.ko
-lib/modules/max77779-fwupdate.ko
-lib/modules/max77779-sp-i2c.ko
-lib/modules/max77779-sp.ko
-lib/modules/max77779-vimon-i2c.ko
-lib/modules/max77779-vimon.ko
-lib/modules/max77779_contaminant.ko
-lib/modules/max77779_i2cm.ko
-lib/modules/max77779_i2cm_i2c.ko
-lib/modules/max77779_pmic.ko
-lib/modules/max77779_pmic_i2c.ko
-lib/modules/max77779_pmic_irq.ko
-lib/modules/max77779_pmic_pinctrl.ko
-lib/modules/max77779_pmic_sgpio.ko
-lib/modules/max777x9_contaminant.ko
 lib/modules/max77826-gs-regulator.ko
 lib/modules/mcps802154.ko
 lib/modules/mcps802154_region_fira.ko
 lib/modules/mcps802154_region_nfcc_coex.ko
 lib/modules/mcps802154_region_pctt.ko
-lib/modules/mii.ko
+lib/modules/memlat-devfreq.ko
 lib/modules/modules.alias
 lib/modules/modules.blocklist
 lib/modules/modules.dep
 lib/modules/modules.load
 lib/modules/modules.softdep
-lib/modules/nfc.ko
-lib/modules/nhc_dest.ko
-lib/modules/nhc_fragment.ko
-lib/modules/nhc_hop.ko
-lib/modules/nhc_ipv6.ko
-lib/modules/nhc_mobility.ko
-lib/modules/nhc_routing.ko
-lib/modules/nhc_udp.ko
 lib/modules/nitrous.ko
-lib/modules/odpm-whi.ko
+lib/modules/odpm.ko
+lib/modules/overheat_mitigation.ko
 lib/modules/p9221.ko
 lib/modules/panel-boe-nt37290.ko
-lib/modules/panel-common.ko
 lib/modules/panel-samsung-drv.ko
 lib/modules/panel-samsung-emul.ko
 lib/modules/panel-samsung-s6e3fc3-p10.ko
 lib/modules/panel-samsung-s6e3fc3.ko
-lib/modules/panel-samsung-s6e3fc3_6a.ko
 lib/modules/panel-samsung-s6e3hc2.ko
 lib/modules/panel-samsung-s6e3hc3-c10.ko
 lib/modules/panel-samsung-s6e3hc3.ko
 lib/modules/panel-samsung-s6e3hc4.ko
 lib/modules/panel-samsung-sofef01.ko
 lib/modules/pca9468.ko
-lib/modules/pcie-exynos-gs.ko
+lib/modules/pcie-exynos-core.ko
 lib/modules/pcie-exynos-gs101-rc-cal.ko
 lib/modules/phy-exynos-mipi-dsim.ko
 lib/modules/phy-exynos-mipi.ko
 lib/modules/phy-exynos-usbdrd-super.ko
-lib/modules/pinctrl-exynos-gs.ko
+lib/modules/pinctrl-samsung-core.ko
 lib/modules/pinctrl-slg51000.ko
 lib/modules/pixel-boot-metrics.ko
 lib/modules/pixel-debug-test.ko
-lib/modules/pixel-reboot.ko
 lib/modules/pixel-suspend-diag.ko
 lib/modules/pixel_em.ko
 lib/modules/pixel_metrics.ko
@@ -918,25 +833,16 @@ lib/modules/pktgen.ko
 lib/modules/pl330.ko
 lib/modules/pmic_class.ko
 lib/modules/power_stats.ko
-lib/modules/ppp_deflate.ko
-lib/modules/ppp_generic.ko
-lib/modules/ppp_mppe.ko
-lib/modules/pppox.ko
-lib/modules/pptp.ko
-lib/modules/r8152.ko
-lib/modules/r8153_ecm.ko
-lib/modules/rfcomm.ko
-lib/modules/rfkill.ko
-lib/modules/rt9471_charger.ko
+lib/modules/pps-gpio.ko
+lib/modules/pps_core.ko
 lib/modules/rtc-s2mpg10.ko
-lib/modules/rtl8150.ko
 lib/modules/s2mpg10-mfd.ko
 lib/modules/s2mpg10-powermeter.ko
 lib/modules/s2mpg10-regulator.ko
 lib/modules/s2mpg11-mfd.ko
 lib/modules/s2mpg11-powermeter.ko
 lib/modules/s2mpg11-regulator.ko
-lib/modules/s2mpg1x-gpio.ko
+lib/modules/s2mpg1x-gpio-gs101.ko
 lib/modules/s2mpu.ko
 lib/modules/s3c2410_wdt.ko
 lib/modules/samsung-dma.ko
@@ -954,24 +860,23 @@ lib/modules/slc_acpm.ko
 lib/modules/slc_dummy.ko
 lib/modules/slc_pmon.ko
 lib/modules/slc_pt.ko
-lib/modules/slcan.ko
 lib/modules/slg46826.ko
 lib/modules/slg51000-core.ko
 lib/modules/slg51000-regulator.ko
-lib/modules/slhc.ko
 lib/modules/smfc.ko
 lib/modules/snd-soc-cs35l41-i2c.ko
 lib/modules/snd-soc-cs35l41-spi.ko
 lib/modules/snd-soc-cs35l41.ko
-lib/modules/snd-soc-cs40l26.ko
+lib/modules/snd-soc-max98357a.ko
+lib/modules/snd-soc-rl6231.ko
+lib/modules/snd-soc-rt5682-i2c.ko
+lib/modules/snd-soc-rt5682.ko
 lib/modules/snd-soc-wm-adsp.ko
 lib/modules/snd_soc_cs40l2x.ko
 lib/modules/softdog.ko
 lib/modules/spi-s3c64xx.ko
 lib/modules/spidev.ko
 lib/modules/sscoredump.ko
-lib/modules/sscoredump_sample_test.ko
-lib/modules/sscoredump_test.ko
 lib/modules/st21nfc.ko
 lib/modules/st33spi.ko
 lib/modules/st54spi.ko
@@ -980,7 +885,6 @@ lib/modules/sysrq-hook.ko
 lib/modules/systrace.ko
 lib/modules/tcpci_fusb307.ko
 lib/modules/tcpci_max77759.ko
-lib/modules/tipc.ko
 lib/modules/touch_bus_negotiator.ko
 lib/modules/touch_offload.ko
 lib/modules/trusty-core.ko
@@ -988,28 +892,24 @@ lib/modules/trusty-ipc.ko
 lib/modules/trusty-log.ko
 lib/modules/trusty-test.ko
 lib/modules/trusty-virtio.ko
-lib/modules/ufs-exynos-gs.ko
+lib/modules/ufs-exynos-core.ko
 lib/modules/ufs-pixel-fips140.ko
 lib/modules/usb_f_dm.ko
 lib/modules/usb_f_dm1.ko
 lib/modules/usb_f_etr_miu.ko
+lib/modules/usb_f_rndis.ko
 lib/modules/usb_psy.ko
 lib/modules/usbc_cooling_dev.ko
-lib/modules/usbnet.ko
-lib/modules/usbserial.ko
-lib/modules/vcan.ko
 lib/modules/vh_cgroup.ko
 lib/modules/vh_fs.ko
 lib/modules/vh_mm.ko
 lib/modules/vh_preemptirq_long.ko
 lib/modules/vh_sched.ko
 lib/modules/vh_thermal.ko
-lib/modules/wwan.ko
 lib/modules/xhci-exynos.ko
 lib/modules/zcomp_cpu.ko
 lib/modules/zcomp_eh.ko
 lib/modules/zram.ko
-lib/modules/zram_gs.ko
 lib/modules/zsmalloc.ko
 lib/pixel-power-ext-V1-ndk.so
 lib/pixel_stateresidency_provider_aidl_interface-ndk.so
@@ -1024,10 +924,11 @@ lib/soundfx/libhapticgenerator.so
 lib/soundfx/libldnhncr.so
 lib/soundfx/libreverbwrapper.so
 lib/soundfx/libvisualizer.so
+lib64/PixelVibratorStats.so
 lib64/android.frameworks.sensorservice-V1-ndk.so
 lib64/android.frameworks.stats-V1-ndk.so
 lib64/android.frameworks.stats-V2-ndk.so
-lib64/android.hardware.audio.common-V4-ndk.so
+lib64/android.hardware.audio.common-V3-ndk.so
 lib64/android.hardware.audio.common-util.so
 lib64/android.hardware.audio.common@2.0.so
 lib64/android.hardware.audio.common@5.0.so
@@ -1041,7 +942,7 @@ lib64/android.hardware.audio.effect@7.0.so
 lib64/android.hardware.audio@7.0.so
 lib64/android.hardware.audio@7.1-util.so
 lib64/android.hardware.audio@7.1.so
-lib64/android.hardware.bluetooth.audio-V5-ndk.so
+lib64/android.hardware.bluetooth.audio-V4-ndk.so
 lib64/android.hardware.bluetooth.audio-impl.so
 lib64/android.hardware.bluetooth.audio@2.0.so
 lib64/android.hardware.bluetooth.audio@2.1.so
@@ -1051,18 +952,19 @@ lib64/android.hardware.boot@1.1.so
 lib64/android.hardware.common-V2-ndk.so
 lib64/android.hardware.common.fmq-V1-ndk.so
 lib64/android.hardware.drm-V1-ndk.so
-lib64/android.hardware.drm.common-V1-ndk.so
 lib64/android.hardware.dumpstate-V1-ndk.so
 lib64/android.hardware.gatekeeper-V1-ndk.so
+lib64/android.hardware.graphics.allocator-V1-ndk.so
 lib64/android.hardware.graphics.allocator-V2-ndk.so
 lib64/android.hardware.graphics.allocator@2.0.so
 lib64/android.hardware.graphics.allocator@3.0.so
 lib64/android.hardware.graphics.allocator@4.0.so
-lib64/android.hardware.graphics.common-V6-ndk.so
+lib64/android.hardware.graphics.common-V3-ndk.so
+lib64/android.hardware.graphics.common-V5-ndk.so
 lib64/android.hardware.graphics.common@1.0.so
 lib64/android.hardware.graphics.common@1.1.so
 lib64/android.hardware.graphics.common@1.2.so
-lib64/android.hardware.graphics.composer3-V4-ndk.so
+lib64/android.hardware.graphics.composer3-V3-ndk.so
 lib64/android.hardware.graphics.composer@2.1-resources.so
 lib64/android.hardware.graphics.composer@2.1.so
 lib64/android.hardware.graphics.composer@2.2-resources.so
@@ -1073,13 +975,13 @@ lib64/android.hardware.graphics.mapper@2.0.so
 lib64/android.hardware.graphics.mapper@2.1.so
 lib64/android.hardware.graphics.mapper@3.0.so
 lib64/android.hardware.graphics.mapper@4.0.so
-lib64/android.hardware.health-V4-ndk.so
+lib64/android.hardware.health-V3-ndk.so
 lib64/android.hardware.health.storage-V1-ndk.so
 lib64/android.hardware.memtrack-V1-ndk.so
 lib64/android.hardware.nfc-V1-ndk.so
 lib64/android.hardware.power-V1-ndk.so
 lib64/android.hardware.power-V2-ndk.so
-lib64/android.hardware.power-V6-ndk.so
+lib64/android.hardware.power-V5-ndk.so
 lib64/android.hardware.power.stats-V2-ndk.so
 lib64/android.hardware.power.stats-impl.gs-common.so
 lib64/android.hardware.power.stats-impl.gs101.so
@@ -1091,11 +993,11 @@ lib64/android.hardware.secure_element@1.0.so
 lib64/android.hardware.secure_element@1.1.so
 lib64/android.hardware.secure_element@1.2.so
 lib64/android.hardware.security.keymint-V1-ndk.so
-lib64/android.hardware.security.keymint-V4-ndk.so
+lib64/android.hardware.security.keymint-V3-ndk.so
 lib64/android.hardware.security.rkp-V3-ndk.so
 lib64/android.hardware.security.secureclock-V1-ndk.so
 lib64/android.hardware.security.sharedsecret-V1-ndk.so
-lib64/android.hardware.sensors-V3-ndk.so
+lib64/android.hardware.sensors-V2-ndk.so
 lib64/android.hardware.sensors@1.0.so
 lib64/android.hardware.sensors@2.0-ScopedWakelock.so
 lib64/android.hardware.sensors@2.0.so
@@ -1106,29 +1008,32 @@ lib64/android.hardware.soundtrigger@2.1.so
 lib64/android.hardware.soundtrigger@2.2.so
 lib64/android.hardware.soundtrigger@2.3.so
 lib64/android.hardware.thermal-V1-ndk.so
-lib64/android.hardware.thermal-V3-ndk.so
+lib64/android.hardware.thermal-V2-ndk.so
 lib64/android.hardware.thermal@1.0.so
 lib64/android.hardware.thermal@2.0.so
 lib64/android.hardware.usb-V3-ndk.so
 lib64/android.hardware.usb.gadget-V1-ndk.so
 lib64/android.hardware.usb.gadget@1.0.so
-lib64/android.hardware.wifi-V3-ndk.so
-lib64/android.hardware.wifi.common-V2-ndk.so
-lib64/android.hardware.wifi.hostapd-V3-ndk.so
-lib64/android.hardware.wifi.supplicant-V4-ndk.so
+lib64/android.hardware.vibrator-V2-ndk.so
+lib64/android.hardware.wifi-V2-ndk.so
+lib64/android.hardware.wifi.common-V1-ndk.so
+lib64/android.hardware.wifi.hostapd-V2-ndk.so
+lib64/android.hardware.wifi.supplicant-V3-ndk.so
 lib64/android.hidl.allocator@1.0.so
 lib64/android.hidl.memory.token@1.0.so
 lib64/android.hidl.memory@1.0.so
 lib64/android.hidl.safe_union@1.0.so
-lib64/android.media.audio.common.types-V4-ndk.so
+lib64/android.media.audio.common.types-V3-ndk.so
 lib64/android.system.keystore2-V1-ndk.so
 lib64/android.system.suspend-V1-ndk.so
 lib64/arm.graphics-V1-ndk.so
-lib64/com.google.hardware.pixel.display-V13-ndk.so
+lib64/com.google.hardware.pixel.display-V10-ndk.so
 lib64/hw/android.hardware.audio.effect@7.0-impl.so
 lib64/hw/android.hardware.audio@7.1-impl.so
 lib64/hw/android.hardware.graphics.allocator-aidl-impl.so
+lib64/hw/android.hardware.graphics.mapper@4.0-impl.so
 lib64/hw/android.hardware.soundtrigger@2.3-impl.so
+lib64/hw/android.hardware.vibrator-impl.cs40l25.so
 lib64/hw/android.hidl.memory@1.0-impl.so
 lib64/hw/audio.bluetooth.default.so
 lib64/hw/audio.primary.default.so
@@ -1138,13 +1043,10 @@ lib64/hw/audio.usbv2.default.so
 lib64/hw/gralloc.default.so
 lib64/hw/hwcomposer.gs101.so
 lib64/hw/local_time.default.so
-lib64/hw/mapper.pixel.so
 lib64/hw/power.default.so
 lib64/hw/vibrator.default.so
 lib64/libExynosHWCService.so
-lib64/libOpenCL.so
 lib64/lib_android_keymaster_keymint_utils.so
-lib64/libaconfig_storage_read_api_cc.so
 lib64/libacryl.so
 lib64/libacryl_hdr_plugin.so
 lib64/libalsautils.so
@@ -1160,6 +1062,8 @@ lib64/libbluetooth_audio_session_aidl.so
 lib64/libc++.so
 lib64/libcfg_if.dylib.so
 lib64/libclang_rt.ubsan_standalone-aarch64-android.so
+lib64/libcppbor_external.so
+lib64/libcppcose_rkp.so
 lib64/libcrypto.so
 lib64/libcutils.so
 lib64/libdisppower-pixel.so
@@ -1186,7 +1090,8 @@ lib64/libhwjpeg.so
 lib64/libion_google.so
 lib64/libjsoncpp.so
 lib64/libkeymaster_messages.so
-lib64/libkeymasterconfig.so
+lib64/libkeymaster_portable.so
+lib64/libkeymint.so
 lib64/libkeystore-engine-wifi-hidl.so
 lib64/liblibloading.dylib.so
 lib64/liblog_rust.dylib.so
@@ -1206,10 +1111,12 @@ lib64/libpower.so
 lib64/libprocessgroup.so
 lib64/libprotobuf-cpp-full-21.12.so
 lib64/libprotobuf-cpp-lite-21.12.so
+lib64/libpuresoftkeymasterdevice.so
 lib64/libreference-ril.so
 lib64/libril.so
 lib64/librilutils.so
 lib64/libsensorndkbridge.so
+lib64/libsoft_attestation_cert.so
 lib64/libspeexresampler.so
 lib64/libssl.so
 lib64/libstagefright_foundation.so
@@ -1250,42 +1157,27 @@ lib64/soundfx/libvisualizer.so
 odm/etc/build.prop
 odm/etc/group
 odm/etc/passwd
-odm/etc/selinux/odm_file_contexts
-odm/etc/selinux/odm_hwservice_contexts
-odm/etc/selinux/odm_mac_permissions.xml
-odm/etc/selinux/odm_property_contexts
-odm/etc/selinux/odm_seapp_contexts
-odm/etc/selinux/odm_sepolicy.cil
-odm/etc/selinux/odm_service_contexts
 odm_dlkm/etc/build.prop
+overlay/EmergencyInfo__oriole__auto_generated_rro_vendor.apk
+overlay/NfcNci__oriole__auto_generated_rro_vendor.apk
+overlay/ONS__oriole__auto_generated_rro_vendor.apk
+overlay/Settings__oriole__auto_generated_rro_vendor.apk
+overlay/StorageManager__oriole__auto_generated_rro_vendor.apk
+overlay/SystemUI__oriole__auto_generated_rro_vendor.apk
+overlay/TeleService__oriole__auto_generated_rro_vendor.apk
+overlay/Traceur__oriole__auto_generated_rro_vendor.apk
+overlay/framework-res__oriole__auto_generated_rro_vendor.apk
 vendor_dlkm/etc/build.prop
-vendor_dlkm/etc/init.insmod.oriole.cfg
 
 # Exclude overlays, symlinks and extra files that we override
 
 # Overlays
-overlay/DMService__oriole__auto_generated_rro_vendor.apk
 overlay/DeviceDiagnostics__oriole__auto_generated_rro_vendor.apk
+overlay/DMService__oriole__auto_generated_rro_vendor.apk
 overlay/Flipendo__oriole__auto_generated_rro_vendor.apk
-overlay/ONS__oriole__auto_generated_rro_vendor.apk
 overlay/SettingsGoogle__oriole__auto_generated_rro_vendor.apk
 overlay/StorageManagerGoogle__oriole__auto_generated_rro_vendor.apk
 overlay/SystemUIGoogle__oriole__auto_generated_rro_vendor.apk
-overlay/TeleService__oriole__auto_generated_rro_vendor.apk
-overlay/Traceur__oriole__auto_generated_rro_vendor.apk
-overlay/framework-res__oriole__auto_generated_rro_vendor.apk
-
-# beta
-overlay/DMService__oriole_beta__auto_generated_rro_vendor.apk
-overlay/DeviceDiagnostics__oriole_beta__auto_generated_rro_vendor.apk
-overlay/Flipendo__oriole_beta__auto_generated_rro_vendor.apk
-overlay/ONS__oriole_beta__auto_generated_rro_vendor.apk
-overlay/SettingsGoogle__oriole_beta__auto_generated_rro_vendor.apk
-overlay/StorageManagerGoogle__oriole_beta__auto_generated_rro_vendor.apk
-overlay/SystemUIGoogle__oriole_beta__auto_generated_rro_vendor.apk
-overlay/TeleService__oriole_beta__auto_generated_rro_vendor.apk
-overlay/Traceur__oriole_beta__auto_generated_rro_vendor.apk
-overlay/framework-res__oriole_beta__auto_generated_rro_vendor.apk
 
 # Symlinks
 lib/modules
@@ -1303,10 +1195,12 @@ lib64/libtinycompress.so
 
 # Bluetooth
 lib64/android.hardware.bluetooth-V1-ndk.so
-lib64/android.hardware.bluetooth.finder-V1-ndk.so
-lib64/android.hardware.bluetooth.ranging-V1-ndk.so
 lib64/hardware.google.bluetooth.bt_channel_avoidance@1.0.so
 
+# Camera
+lib/libGralloc4Wrapper.so
+lib64/libGralloc4Wrapper.so
+
 # Charger
 etc/res/images/charger/battery_fail.png
 etc/res/images/charger/battery_scale.png
@@ -1314,6 +1208,7 @@ etc/res/images/charger/main_font.png
 etc/res/values/charger/animation.txt
 
 # Codec2
+lib/android.hardware.media.bufferpool2-V1-ndk.so
 lib/android.hardware.media.bufferpool2-V2-ndk.so
 lib/android.hardware.media.bufferpool@2.0.so
 lib/android.hardware.media.c2-V1-ndk.so
@@ -1329,6 +1224,7 @@ lib/libmedia_ecoservice.so
 lib/libsfplugin_ccodec_utils.so
 lib/libstagefright_aidl_bufferpool2.so
 lib/libstagefright_bufferpool@2.0.1.so
+lib64/android.hardware.media.bufferpool2-V1-ndk.so
 lib64/android.hardware.media.bufferpool2-V2-ndk.so
 lib64/android.hardware.media.bufferpool@2.0.so
 lib64/android.hardware.media.c2-V1-ndk.so
@@ -1340,7 +1236,6 @@ lib64/android.hardware.media@1.0.so
 lib64/libavservices_minijail.so
 lib64/libcap.so
 lib64/libcodec2.so
-lib64/libcodec2_aidl.so
 lib64/libcodec2_hal_common.so
 lib64/libcodec2_hidl@1.0.so
 lib64/libcodec2_hidl@1.1.so
@@ -1368,11 +1263,9 @@ lib64/android.hardware.confirmationui@1.0.so
 lib64/libteeui_hal_support.so
 
 # Contexthub
-lib/android.hardware.contexthub-V3-ndk.so
-lib/android.hardware.contexthub-V4-ndk.so
 lib64/android.hardware.contexthub-V3-ndk.so
-lib64/android.hardware.contexthub-V4-ndk.so
 lib64/chre_atoms_log.so
+lib64/chre_metrics_reporter.so
 lib64/chremetrics-cpp.so
 
 # Fingerprint
@@ -1388,17 +1281,18 @@ lib/libhwbinder.so
 lib64/libhidltransport.so
 lib64/libhwbinder.so
 
+# Identity credential
+etc/permissions/android.hardware.identity_credential.xml
+lib64/android.hardware.identity-V5-ndk.so
+lib64/android.hardware.identity-support-lib.so
+
 # Json
 lib/libjsoncpp.so
 lib64/libjson.so
 
 # Nos
-lib64/android.hardware.security.keymint-V3-ndk.so
-lib64/libcppbor.so
-lib64/libcppcose_rkp.so
-lib64/libkeymaster_portable.so
+lib64/libkeymaster4support.so
 lib64/libkeymint_support.so
-lib64/libkeymint_support_V3.so
 lib64/libnos.so
 lib64/libnos_client_citadel.so
 lib64/libnos_datagram.so
@@ -1407,7 +1301,9 @@ lib64/libnos_feature.so
 lib64/libnos_transport.so
 lib64/libnosprotos.so
 lib64/nos_app_avb.so
+lib64/nos_app_identity.so
 lib64/nos_app_keymaster.so
+lib64/nos_app_keymaster_ctdl.so
 lib64/nos_app_weaver.so
 lib64/pixelpowerstats_provider_aidl_interface-cpp.so
 
@@ -1428,7 +1324,7 @@ lib64/modem_clock_manager_impl.so
 
 # Sensors
 lib/android.frameworks.sensorservice-V1-ndk.so
-lib/android.hardware.sensors-V3-ndk.so
+lib/android.hardware.sensors-V2-ndk.so
 lib/android.hardware.sensors@1.0.so
 lib/android.hardware.sensors@2.0-ScopedWakelock.so
 lib/android.hardware.sensors@2.0.so
@@ -1436,7 +1332,6 @@ lib/android.hardware.sensors@2.1.so
 lib/hw/sensors.dynamic_sensor_hal.so
 lib/libhidparser.so
 lib/libsensorndkbridge.so
-lib64/android.hardware.sensors-V2-ndk.so
 lib64/hw/sensors.dynamic_sensor_hal.so
 lib64/libhidparser.so
 
@@ -1470,17 +1365,18 @@ lib/android.hardware.thermal@2.0.so
 lib/com.google.hardware.pixel.display-V9-ndk.so
 lib64/android.frameworks.stats-V1-cpp.so
 lib64/android.hardware.authsecret-V1-ndk.so
-lib64/android.hardware.biometrics.common-V3-ndk.so
-lib64/android.hardware.biometrics.fingerprint-V3-ndk.so
+lib64/android.hardware.biometrics.common-V2-ndk.so
+lib64/android.hardware.biometrics.fingerprint-V2-ndk.so
 lib64/android.hardware.gnss-V3-ndk.so
 lib64/android.hardware.graphics.bufferqueue@1.0.so
 lib64/android.hardware.graphics.bufferqueue@2.0.so
 lib64/android.hardware.health-V1-ndk.so
 lib64/android.hardware.input.common-V1-ndk.so
 lib64/android.hardware.input.processor-V1-ndk.so
-lib64/android.hardware.keymaster-V4-ndk.so
+lib64/android.hardware.keymaster-V3-ndk.so
 lib64/android.hardware.keymaster@3.0.so
 lib64/android.hardware.keymaster@4.0.so
+lib64/android.hardware.keymaster@4.1.so
 lib64/android.hardware.neuralnetworks-V4-ndk.so
 lib64/android.hardware.neuralnetworks@1.0.so
 lib64/android.hardware.neuralnetworks@1.1.so
@@ -1499,8 +1395,8 @@ lib64/android.hardware.radio@1.3.so
 lib64/android.hardware.radio@1.4.so
 lib64/android.hardware.radio@1.5.so
 lib64/android.hardware.radio@1.6.so
-lib64/android.hardware.vibrator-V2-ndk.so
 lib64/android.hardware.weaver-V2-ndk.so
+lib64/android.hardware.wifi-V1-ndk.so
 lib64/android.hidl.token@1.0-utils.so
 lib64/android.hidl.token@1.0.so
 lib64/com.google.hardware.pixel.display-V4-ndk.so
@@ -1513,12 +1409,6 @@ lib/libion.so
 lib64/libevent.so
 lib64/libion.so
 
-# Odex
-framework/oat/arm/com.google.android.camera.experimental2021.odex
-framework/oat/arm/com.google.android.camera.experimental2021.vdex
-framework/oat/arm64/com.google.android.camera.experimental2021.odex
-framework/oat/arm64/com.google.android.camera.experimental2021.vdex
-
 # Completely skip files that are not required
 
 # Edge TPU
@@ -1527,9 +1417,6 @@ lib/libedgetpu_util.so
 # Google
 etc/default-permissions/default-permissions_talkback.xml
 
-# GXP
-lib64/libgxp.so
-
 # Secure element
 lib/android.hardware.secure_element.thales.libse.so
 lib/libstpreprocess21.so

oriole/vendor.prop

@@ -8,3 +8,6 @@ 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
+
+# SSR
+vendor.debug.ssrdump.type=sscoredump

powerhint-oriole-mainline.json

@@ -1023,6 +1023,18 @@
       "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",
@@ -1218,26 +1230,16 @@
       "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,
-      "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
+      "StaleTimeFactor": 15
     },
     {
       "Name": "REFRESH_90FPS",
@@ -1252,26 +1254,16 @@
       "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,
-      "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
+      "StaleTimeFactor": 15
     },
     {
       "Name": "REFRESH_60FPS",
@@ -1286,26 +1278,16 @@
       "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,
-      "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
+      "StaleTimeFactor": 15
     },
     {
       "Name": "UiHighBoostWithoutPid",
@@ -1350,6 +1332,8 @@
       "UclampMin_High": 53,
       "UclampMin_Low": 53,
       "ReportingRateLimitNs": 1,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0,
       "TargetTimeFactor": 1,
       "StaleTimeFactor": 5
     },
@@ -1372,6 +1356,8 @@
       "UclampMin_High": 0,
       "UclampMin_Low": 0,
       "ReportingRateLimitNs": 1,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0,
       "TargetTimeFactor": 1,
       "StaleTimeFactor": 5
     }

powerhint-oriole.json

@@ -319,6 +319,14 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "NewlyIdleBalancer",
+      "Path": "/proc/vendor_sched/idle_balancer",
+      "Values": [
+        "0",
+        "1"
+      ]
+    },
     {
       "Name": "LimitFlashCurrent",
       "Path": "vendor.camera.max_flash_current",
@@ -1062,6 +1070,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_EXTREME",
+      "Node": "NewlyIdleBalancer",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PowerHALCameraRunning",
@@ -1134,6 +1148,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "NewlyIdleBalancer",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PowerHALCameraRunning",
@@ -1188,6 +1208,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "NewlyIdleBalancer",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "PowerHALCameraRunning",
@@ -1248,6 +1274,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_LOW",
+      "Node": "NewlyIdleBalancer",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_VIDEO_RECORDING",
       "Type": "MaskHint",
@@ -1459,6 +1491,18 @@
       "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",
@@ -1702,27 +1746,16 @@
       "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,
-      "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
+      "StaleTimeFactor": 15.0
     },
     {
       "Name": "REFRESH_90FPS",
@@ -1737,27 +1770,16 @@
       "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,
-      "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
+      "StaleTimeFactor": 15.0
     },
     {
       "Name": "REFRESH_60FPS",
@@ -1772,27 +1794,16 @@
       "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,
-      "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
+      "StaleTimeFactor": 15.0
     },
     {
       "Name": "UiHighBoostWithoutPid",
@@ -1812,8 +1823,9 @@
       "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
     },
@@ -1835,8 +1847,9 @@
       "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
     },
@@ -1858,8 +1871,9 @@
       "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
     }

powerhint-raven-mainline.json

@@ -1004,6 +1004,18 @@
       "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",
@@ -1199,26 +1211,16 @@
       "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,
-      "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
+      "StaleTimeFactor": 15
     },
     {
       "Name": "REFRESH_90FPS",
@@ -1233,26 +1235,16 @@
       "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,
-      "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
+      "StaleTimeFactor": 15
     },
     {
       "Name": "REFRESH_60FPS",
@@ -1267,26 +1259,16 @@
       "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,
-      "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
+      "StaleTimeFactor": 15
     },
     {
       "Name": "UiHighBoostWithoutPid",
@@ -1307,6 +1289,8 @@
       "UclampMin_High": 197,
       "UclampMin_Low": 197,
       "ReportingRateLimitNs": 1,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0,
       "TargetTimeFactor": 1,
       "StaleTimeFactor": 5
     },
@@ -1329,6 +1313,8 @@
       "UclampMin_High": 53,
       "UclampMin_Low": 53,
       "ReportingRateLimitNs": 1,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0,
       "TargetTimeFactor": 1,
       "StaleTimeFactor": 5
     },
@@ -1351,6 +1337,8 @@
       "UclampMin_High": 0,
       "UclampMin_Low": 0,
       "ReportingRateLimitNs": 1,
+      "EarlyBoost_On": false,
+      "EarlyBoost_TimeFactor": 0,
       "TargetTimeFactor": 1,
       "StaleTimeFactor": 5
     }

powerhint-raven.json

@@ -318,6 +318,14 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "NewlyIdleBalancer",
+      "Path": "/proc/vendor_sched/idle_balancer",
+      "Values": [
+        "0",
+        "1"
+      ]
+    },
     {
       "Name": "LimitFlashCurrent",
       "Path": "vendor.camera.max_flash_current",
@@ -1061,6 +1069,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_EXTREME",
+      "Node": "NewlyIdleBalancer",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PowerHALCameraRunning",
@@ -1133,6 +1147,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "NewlyIdleBalancer",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PowerHALCameraRunning",
@@ -1187,6 +1207,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "NewlyIdleBalancer",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "PowerHALCameraRunning",
@@ -1247,6 +1273,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_LOW",
+      "Node": "NewlyIdleBalancer",
+      "Duration": 0,
+      "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_VIDEO_RECORDING",
       "Type": "MaskHint",
@@ -1440,6 +1472,18 @@
       "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",
@@ -1683,27 +1727,16 @@
       "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,
-      "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
+      "StaleTimeFactor": 15.0
     },
     {
       "Name": "REFRESH_90FPS",
@@ -1718,27 +1751,16 @@
       "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,
-      "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
+      "StaleTimeFactor": 15.0
     },
     {
       "Name": "REFRESH_60FPS",
@@ -1753,27 +1775,16 @@
       "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,
-      "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
+      "StaleTimeFactor": 15.0
     },
     {
       "Name": "UiHighBoostWithoutPid",
@@ -1793,8 +1804,9 @@
       "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
     },
@@ -1816,8 +1828,9 @@
       "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
     },
@@ -1839,8 +1852,9 @@
       "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
     }

powerhint-slider.json

@@ -1348,6 +1348,18 @@
       "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",
@@ -1491,7 +1503,6 @@
       "UclampMin_Init": 232,
       "UclampMin_High": 480,
       "UclampMin_Low": 2,
-      "UclampMax_Efficient": 400,
       "SamplingWindow_P": 1,
       "SamplingWindow_I": 0,
       "SamplingWindow_D": 1,
@@ -1499,17 +1510,7 @@
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.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
+      "StaleTimeFactor": 20.0
     },
     {
       "Name": "REFRESH_90FPS",
@@ -1526,7 +1527,6 @@
       "UclampMin_Init": 162,
       "UclampMin_High": 480,
       "UclampMin_Low": 2,
-      "UclampMax_Efficient": 400,
       "SamplingWindow_P": 1,
       "SamplingWindow_I": 0,
       "SamplingWindow_D": 1,
@@ -1534,17 +1534,7 @@
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.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
+      "StaleTimeFactor": 20.0
     },
     {
       "Name": "REFRESH_60FPS",
@@ -1561,7 +1551,6 @@
       "UclampMin_Init": 162,
       "UclampMin_High": 480,
       "UclampMin_Low": 2,
-      "UclampMax_Efficient": 400,
       "SamplingWindow_P": 1,
       "SamplingWindow_I": 0,
       "SamplingWindow_D": 1,
@@ -1569,17 +1558,7 @@
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.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
+      "StaleTimeFactor": 20.0
     },
     {
       "Name": "UiHighBoostWithoutPid",
@@ -1599,7 +1578,6 @@
       "UclampMin_Init": 250,
       "UclampMin_High": 197,
       "UclampMin_Low": 197,
-      "UclampMax_Efficient": 400,
       "ReportingRateLimitNs": 1,
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,
@@ -1624,7 +1602,6 @@
       "UclampMin_Init": 250,
       "UclampMin_High": 53,
       "UclampMin_Low": 53,
-      "UclampMax_Efficient": 400,
       "ReportingRateLimitNs": 1,
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,
@@ -1649,7 +1626,6 @@
       "UclampMin_Init": 250,
       "UclampMin_High": 0,
       "UclampMin_Low": 0,
-      "UclampMax_Efficient": 400,
       "ReportingRateLimitNs": 1,
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,

powerhint-whitefin.json

@@ -1333,6 +1333,18 @@
       "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",
@@ -1458,7 +1470,6 @@
       "UclampMin_Init": 232,
       "UclampMin_High": 480,
       "UclampMin_Low": 2,
-      "UclampMax_Efficient": 400,
       "SamplingWindow_P": 1,
       "SamplingWindow_I": 0,
       "SamplingWindow_D": 1,
@@ -1466,17 +1477,7 @@
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.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
+      "StaleTimeFactor": 20.0
     },
     {
       "Name": "REFRESH_90FPS",
@@ -1493,7 +1494,6 @@
       "UclampMin_Init": 162,
       "UclampMin_High": 480,
       "UclampMin_Low": 2,
-      "UclampMax_Efficient": 400,
       "SamplingWindow_P": 1,
       "SamplingWindow_I": 0,
       "SamplingWindow_D": 1,
@@ -1501,17 +1501,7 @@
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.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
+      "StaleTimeFactor": 20.0
     },
     {
       "Name": "REFRESH_60FPS",
@@ -1528,7 +1518,6 @@
       "UclampMin_Init": 162,
       "UclampMin_High": 480,
       "UclampMin_Low": 2,
-      "UclampMax_Efficient": 400,
       "SamplingWindow_P": 1,
       "SamplingWindow_I": 0,
       "SamplingWindow_D": 1,
@@ -1536,17 +1525,7 @@
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.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
+      "StaleTimeFactor": 20.0
     },
     {
       "Name": "UiHighBoostWithoutPid",
@@ -1566,7 +1545,6 @@
       "UclampMin_Init": 250,
       "UclampMin_High": 197,
       "UclampMin_Low": 197,
-      "UclampMax_Efficient": 400,
       "ReportingRateLimitNs": 1,
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,
@@ -1591,7 +1569,6 @@
       "UclampMin_Init": 250,
       "UclampMin_High": 53,
       "UclampMin_Low": 53,
-      "UclampMax_Efficient": 400,
       "ReportingRateLimitNs": 1,
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,
@@ -1616,7 +1593,6 @@
       "UclampMin_Init": 250,
       "UclampMin_High": 0,
       "UclampMin_Low": 0,
-      "UclampMax_Efficient": 400,
       "ReportingRateLimitNs": 1,
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,

raven/Android.bp

@@ -1,11 +0,0 @@
-//
-// 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,
-}

raven/BoardConfig.mk

@@ -18,12 +18,20 @@
 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
@@ -42,16 +50,6 @@ include device/google/gs101/BoardConfig-common.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
+include device/google/raviole/raven/BoardConfigLineage.mk

raven/BoardConfigEvolution.mk

@@ -1,6 +0,0 @@
-#
-# SPDX-FileCopyrightText: 2024 The Evolution X Project
-# SPDX-License-Identifier: Apache-2.0
-#
-
-include $(DEVICE_PATH)/BoardConfigEvolution.mk

raven/BoardConfigLineage.mk

@@ -1,9 +1,9 @@
 #
-# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
-# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# Copyright (C) 2021 The LineageOS Project
+#
 # SPDX-License-Identifier: Apache-2.0
 #
 
-include $(DEVICE_PATH)/BoardConfigLineage.mk
+include device/google/raviole/BoardConfigLineage.mk
 
-include $(VENDOR_PATH)/BoardConfigVendor.mk
+include vendor/google/raven/BoardConfigVendor.mk

raven/device-evolution.mk

@@ -1,8 +1,9 @@
 #
-# SPDX-FileCopyrightText: 2024 The Evolution X Project
+# Copyright (C) 2024 The Evolution X Project
+#
 # SPDX-License-Identifier: Apache-2.0
 #
 
-$(call inherit-product, $(DEVICE_PATH)/device-evolution.mk)
+DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/raven/overlay-evolution
 
-DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/$(DEVICE_CODENAME)/overlay-evolution
+$(call inherit-product, $(LOCAL_PATH)/device-evolution.mk)

raven/device-lineage.mk

@@ -1,13 +1,9 @@
 #
-# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
-# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# Copyright (C) 2022 The LineageOS Project
+#
 # SPDX-License-Identifier: Apache-2.0
 #
 
-$(call inherit-product, $(DEVICE_PATH)/device-lineage.mk)
+DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/raven/overlay-lineage
 
-DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/$(DEVICE_CODENAME)/overlay-lineage
-
-# Init
-PRODUCT_PACKAGES += \
-    init.recovery.raven.touch.rc
+$(call inherit-product, $(LOCAL_PATH)/device-lineage.mk)

raven/extract-files.py

@@ -1,107 +0,0 @@
-#!/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(
-    'raven',
-    'google',
-    device_rel_path='device/google/raviole/raven',
-    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()

raven/extract-files.sh

@@ -0,0 +1,149 @@
+#!/bin/bash
+#
+# SPDX-FileCopyrightText: 2016 The CyanogenMod Project
+# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set -e
+
+DEVICE=raven
+VENDOR=google
+
+# Load extract_utils and do some sanity checks
+MY_DIR="${BASH_SOURCE%/*}"
+if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
+
+ANDROID_ROOT="${MY_DIR}/../../../.."
+
+export TARGET_ENABLE_CHECKELF=true
+
+# If XML files don't have comments before the XML header, use this flag
+# Can still be used with broken XML files by using blob_fixup
+export TARGET_DISABLE_XML_FIXING=true
+
+HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
+if [ ! -f "${HELPER}" ]; then
+    echo "Unable to find helper script at ${HELPER}"
+    exit 1
+fi
+source "${HELPER}"
+
+# Default to sanitizing the vendor folder before extraction
+CLEAN_VENDOR=true
+
+ONLY_FIRMWARE=
+KANG=
+SECTION=
+CARRIER_SKIP_FILES=()
+VENDOR_SKIP_FILES=()
+
+while [ "${#}" -gt 0 ]; do
+    case "${1}" in
+        --only-firmware)
+            ONLY_FIRMWARE=true
+            ;;
+        -n | --no-cleanup)
+            CLEAN_VENDOR=false
+            ;;
+        -k | --kang)
+            KANG="--kang"
+            ;;
+        -s | --section)
+            SECTION="${2}"
+            shift
+            CLEAN_VENDOR=false
+            ;;
+        *)
+            SRC="${1}"
+            ;;
+    esac
+    shift
+done
+
+if [ -z "${SRC}" ]; then
+    SRC="adb"
+fi
+
+function blob_fixup() {
+    case "${1}" in
+        product/etc/felica/common.cfg)
+            [ "$2" = "" ] && return 0
+            sed -i -e '$a00000018,1' -e '/^00000014/d' -e '/^00000015/d' "${2}"
+            ;;
+        vendor/etc/init/init.modem_logging_control.rc)
+            [ "$2" = "" ] && return 0
+            sed -i 's/ && property:ro.debuggable=0//' "${2}"
+            ;;
+        *)
+            return 1
+            ;;
+    esac
+
+    return 0
+}
+
+function blob_fixup_dry() {
+    blob_fixup "$1" ""
+}
+
+function prepare_firmware() {
+    if [ "${SRC}" != "adb" ]; then
+        bash "${ANDROID_ROOT}"/lineage/scripts/pixel/prepare-firmware.sh "${DEVICE}" "${SRC}"
+    fi
+}
+
+# Initialize the helper
+setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false "${CLEAN_VENDOR}"
+
+if [ -z "${ONLY_FIRMWARE}" ]; then
+    extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}"
+
+    generate_prop_list_from_image "product.img" "${MY_DIR}/proprietary-files-carriersettings.txt" CARRIER_SKIP_FILES carriersettings
+    extract "${MY_DIR}/proprietary-files-carriersettings.txt" "${SRC}" "${KANG}" --section "${SECTION}"
+
+    readarray -t VENDOR_SKIP_FILES < <(cat "${MY_DIR}/skip-files-vendor.txt" | sed -E "/^[[:blank:]]*(#|$)/d")
+    VENDOR_TXT="${MY_DIR}/proprietary-files-vendor.txt"
+    generate_prop_list_from_image "vendor.img" "${VENDOR_TXT}" VENDOR_SKIP_FILES
+
+    # flp.default & gps.default have incorrect SONAME
+    # libExynosC2*Dec & libExynosC2*Enc depend on libacryl & libexynosv4l2, which are gnu makefile targets
+    set_disable_checkelf "vendor/lib/libExynosC2H263Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib/libExynosC2H263Enc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib/libExynosC2H264Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib/libExynosC2H264Enc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib/libExynosC2HevcDec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib/libExynosC2HevcEnc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib/libExynosC2Mpeg4Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib/libExynosC2Mpeg4Enc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib/libExynosC2Vp8Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib/libExynosC2Vp8Enc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib/libExynosC2Vp9Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib/libExynosC2Vp9Enc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/hw/flp.default.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/hw/gps.default.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2H263Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2H263Enc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2H264Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2H264Enc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2HevcDec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2HevcEnc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2Mpeg4Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2Mpeg4Enc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2Vp8Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2Vp8Enc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2Vp9Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2Vp9Enc.so" "${VENDOR_TXT}"
+
+    set_module_suffix "vendor/lib/com.google.edgetpu_app_service-V3-ndk.so" "-vendor" "${VENDOR_TXT}"
+    set_module_suffix "vendor/lib64/com.google.edgetpu_app_service-V3-ndk.so" "-vendor" "${VENDOR_TXT}"
+    set_module_suffix "vendor/lib64/com.google.edgetpu_vendor_service-V2-ndk.so" "-vendor" "${VENDOR_TXT}"
+
+    extract "${MY_DIR}/proprietary-files-vendor.txt" "${SRC}" "${KANG}" --section "${SECTION}"
+fi
+
+if [ -z "${SECTION}" ]; then
+    extract_firmware "${MY_DIR}/proprietary-firmware.txt" "${SRC}"
+fi
+
+"${MY_DIR}/setup-makefiles.sh"

raven/init.recovery.touch.rc

@@ -1,2 +0,0 @@
-on init
-   insmod /lib/modules/sec_touch.ko

raven/osaifu-keitai.patch

@@ -1,24 +0,0 @@
-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
-

raven/overlay/frameworks/base/core/res/res/values/config.xml

@@ -43,9 +43,7 @@
 
 
     <!-- Radius of the software rounded corners. -->
-    <dimen name="rounded_corner_radius">67px</dimen>
-    <dimen name="rounded_corner_radius_top">67px</dimen>
-    <dimen name="rounded_corner_radius_bottom">66px</dimen>
+    <dimen name="rounded_corner_radius">50px</dimen>
 
     <!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
     <dimen name="rounded_corner_radius_adjustment">5px</dimen>

raven/overlay/frameworks/base/core/res/res/values/dimens.xml

@@ -16,7 +16,7 @@
 */
 -->
 <resources>
-    <!-- Default paddings for content around the corners. -->
-    <dimen name="rounded_corner_content_padding">14dp</dimen>
+    <!-- for 20dp of padding at 3.5px/dp at default density -->
+    <dimen name="rounded_corner_content_padding">50px</dimen>
 </resources>
 

raven/overlay/frameworks/base/packages/SystemUI/res/values-land/dimen.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (c) 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>
-    <!-- the padding on the top of the statusbar (usually 0) -->
-    <dimen name="status_bar_padding_top">0dp</dimen>
-</resources>

raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml

@@ -16,20 +16,19 @@
 */
 -->
 <resources>
-    <!-- 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_default</dimen>
+    <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height</dimen>
 
-    <!-- Margin on the left side of the carrier text on Keyguard -->
-    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</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>
 
-    <!--  Total minimum padding to enforce to ensure that the dot can always show  -->
-    <dimen name="ongoing_appops_dot_min_padding">14dp</dimen>
+    <!-- Margin on the right side of the system icon group on Keyguard. -->
+    <dimen name="system_icons_keyguard_padding_end">6.5dp</dimen>
 
     <!-- A path similar to frameworks/base/core/res/res/values/config.xml
         config_mainBuiltInDisplayCutout that describes a path larger than the exact path of a display

raven/proprietary-files-carriersettings.txt

@@ -1,8 +1,6 @@
 # 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
@@ -10,13 +8,9 @@ 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
@@ -24,14 +18,12 @@ 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
@@ -57,11 +49,7 @@ 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
@@ -76,7 +64,6 @@ 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
@@ -85,20 +72,15 @@ 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
@@ -108,7 +90,7 @@ 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/fi_us.pb
 product/etc/CarrierSettings/fido_ca.pb
 product/etc/CarrierSettings/finetwork_es.pb
 product/etc/CarrierSettings/firstnet_us.pb
@@ -116,10 +98,7 @@ 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
@@ -128,8 +107,6 @@ 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
@@ -137,7 +114,6 @@ 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
@@ -145,15 +121,9 @@ 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
@@ -161,7 +131,6 @@ 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
@@ -171,33 +140,18 @@ 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
@@ -208,12 +162,9 @@ 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
@@ -231,24 +182,18 @@ 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/reachmobileatt_us.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
@@ -265,47 +210,34 @@ 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
@@ -317,18 +249,15 @@ 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
@@ -336,21 +265,15 @@ 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
@@ -372,7 +295,6 @@ 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
@@ -380,7 +302,6 @@ 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
@@ -390,8 +311,6 @@ 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
@@ -401,7 +320,6 @@ 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
@@ -410,12 +328,10 @@ 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
@@ -425,4 +341,3 @@ 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

raven/proprietary-files.txt

@@ -3,15 +3,14 @@
 # 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
+product/priv-app/DeviceIntelligenceNetworkPrebuilt-v.U.14.playstore/DeviceIntelligenceNetworkPrebuilt-v.U.14.playstore.apk;PRESIGNED
+product/priv-app/DevicePersonalizationPrebuiltPixel2021-v.U.14.playstore/DevicePersonalizationPrebuiltPixel2021-v.U.14.playstore.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
@@ -20,11 +19,6 @@ product/priv-app/GoogleCamera/GoogleCamera.apk;OVERRIDES=Aperture,Camera2;PRESIG
 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
@@ -36,8 +30,8 @@ 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
+product/priv-app/HotwordEnrollmentOKGoogleFUSION/HotwordEnrollmentOKGoogleFUSION.apk;PRESIGNED
+product/priv-app/HotwordEnrollmentXGoogleFUSION/HotwordEnrollmentXGoogleFUSION.apk;PRESIGNED
 
 # IMS
 product/etc/sysconfig/allowlist_com.shannon.imsservice.xml
@@ -64,7 +58,7 @@ product/lib/libdmengine.so;SYMLINK=product/priv-app/DMService/lib/arm/libdmengin
 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/CarrierSettings_signed_45.0.591154042/CarrierSettings_signed_45.0.591154042.apk;PRESIGNED
 product/priv-app/CarrierWifi/CarrierWifi.apk;PRESIGNED
 product/priv-app/ConnMO/ConnMO.apk
 product/priv-app/DCMO/DCMO.apk
@@ -85,11 +79,6 @@ 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
@@ -100,23 +89,15 @@ 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/lib/libedgetpu_dba.google.so
 system_ext/lib64/com.google.edgetpu_app_service-V3-ndk.so
 system_ext/lib64/com.google.edgetpu_vendor_service-V2-ndk.so
+system_ext/lib64/libedgetpu_dba.google.so
 
 # HBM
 system_ext/lib64/libhbmsvmanager_jni.so;SYMLINK=system_ext/priv-app/HbmSVManager/lib/arm64/libhbmsvmanager_jni.so
@@ -136,11 +117,6 @@ 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
 
@@ -160,8 +136,6 @@ 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

raven/rro_overlays/NfcOverlay/res/values/config.xml

@@ -30,7 +30,7 @@
     <item>36</item>
   </integer-array>
   <integer-array name="antenna_y">
-    <item>61</item>
+    <item>106</item>
   </integer-array>
   <bool name="nfc_observe_mode_supported">true</bool>
 </resources>

raven/setup-makefiles.py

@@ -1 +0,0 @@
-#!./extract-files.py --regenerate_makefiles

raven/setup-makefiles.sh

@@ -0,0 +1,82 @@
+#!/bin/bash
+#
+# SPDX-FileCopyrightText: 2016 The CyanogenMod Project
+# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set -e
+
+DEVICE=raven
+VENDOR=google
+
+# Load extract_utils and do some sanity checks
+MY_DIR="${BASH_SOURCE%/*}"
+if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
+
+ANDROID_ROOT="${MY_DIR}/../../../.."
+
+export TARGET_ENABLE_CHECKELF=true
+
+HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
+if [ ! -f "${HELPER}" ]; then
+    echo "Unable to find helper script at ${HELPER}"
+    exit 1
+fi
+source "${HELPER}"
+
+function vendor_imports() {
+    cat <<EOF >>"$1"
+		"device/google/raviole",
+		"hardware/google/av",
+		"hardware/google/gchips",
+		"hardware/google/graphics/common",
+		"hardware/google/interfaces",
+		"hardware/google/pixel",
+EOF
+}
+
+function lib_to_package_fixup_vendor_variants() {
+    if [ "$2" != "vendor" ]; then
+        return 1
+    fi
+
+    case "$1" in
+        com.google.edgetpu_app_service-V3-ndk | \
+            com.google.edgetpu_vendor_service-V2-ndk)
+            echo "$1-vendor"
+            ;;
+        libprotobuf-cpp-full-21.12)
+            echo "libprotobuf-cpp-full"
+            ;;
+        libprotobuf-cpp-lite-21.12)
+            echo "libprotobuf-cpp-lite"
+            ;;
+        libacryl | \
+            libexynosv4l2) ;;
+        *)
+            return 1
+            ;;
+    esac
+}
+
+function lib_to_package_fixup() {
+    lib_to_package_fixup_clang_rt_ubsan_standalone "$1" ||
+        lib_to_package_fixup_proto_3_9_1 "$1" ||
+        lib_to_package_fixup_vendor_variants "$@"
+}
+
+# Initialize the helper
+setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}"
+
+# Warning headers and guards
+write_headers
+
+write_makefiles "${MY_DIR}/proprietary-files.txt"
+write_makefiles "${MY_DIR}/proprietary-files-carriersettings.txt"
+write_makefiles "${MY_DIR}/proprietary-files-vendor.txt"
+
+append_firmware_calls_to_makefiles "${MY_DIR}/proprietary-firmware.txt"
+
+# Finish
+write_footers

raven/skip-files-vendor.txt

@@ -1,10 +1,11 @@
 # Standard build output with vendor image build enabled
+apex/com.android.hardware.cas.apex
+apex/com.android.vndk.current.on_vendor.apex
 bin/[
 bin/acpi
 bin/awk
 bin/base64
 bin/basename
-bin/blkdiscard
 bin/blockdev
 bin/boringssl_self_test32
 bin/boringssl_self_test64
@@ -38,13 +39,12 @@ bin/du
 bin/dump/dump_aoc
 bin/dump/dump_devfreq
 bin/dump/dump_display
-bin/dump/dump_fingerprint
+bin/dump/dump_gs101.sh
 bin/dump/dump_lsi.sh
-bin/dump/dump_modem
+bin/dump/dump_modem.sh
 bin/dump/dump_modemlog
 bin/dump/dump_perf
 bin/dump/dump_pixel_metrics
-bin/dump/dump_power
 bin/dump/dump_sensors
 bin/dump/dump_soc
 bin/dump/dump_storage
@@ -69,7 +69,6 @@ bin/getconf
 bin/getenforce
 bin/getevent
 bin/getfattr
-bin/getopt
 bin/getprop
 bin/gpiodetect
 bin/gpiofind
@@ -89,7 +88,7 @@ bin/hw/android.hardware.cas@1.2-service
 bin/hw/android.hardware.drm-service.clearkey
 bin/hw/android.hardware.dumpstate-service
 bin/hw/android.hardware.gatekeeper-service.trusty
-bin/hw/android.hardware.graphics.allocator-V2-service
+bin/hw/android.hardware.graphics.allocator-V1-service
 bin/hw/android.hardware.graphics.composer@2.4-service
 bin/hw/android.hardware.health-service.gs101
 bin/hw/android.hardware.health.storage-service.default
@@ -105,6 +104,7 @@ bin/hw/android.hardware.sensors-service.multihal
 bin/hw/android.hardware.thermal-service.pixel
 bin/hw/android.hardware.usb-service.gs101
 bin/hw/android.hardware.usb.gadget-service.gs101
+bin/hw/android.hardware.vibrator-service.cs40l25
 bin/hw/android.hardware.wifi-service
 bin/hw/disable_contaminant_detection.sh
 bin/hw/hostapd
@@ -262,11 +262,10 @@ etc/NOTICE.xml.gz
 etc/a2dp_audio_policy_configuration_7_0.xml
 etc/a2dp_in_audio_policy_configuration_7_0.xml
 etc/aconfig_flags.pb
-etc/aidl/hfp/hfp_codec_capabilities.xml
 etc/aidl/le_audio/aidl_audio_set_configurations.bfbs
+etc/aidl/le_audio/aidl_audio_set_configurations.json
 etc/aidl/le_audio/aidl_audio_set_scenarios.bfbs
-etc/aidl/le_audio/aidl_default_audio_set_configurations.json
-etc/aidl/le_audio/aidl_default_audio_set_scenarios.json
+etc/aidl/le_audio/aidl_audio_set_scenarios.json
 etc/aoc/BLUETOOTH.dat
 etc/aoc/HANDSET.dat
 etc/aoc/HANDSFREE.dat
@@ -291,7 +290,6 @@ etc/boringssl_self_test.no_zygote.rc
 etc/boringssl_self_test.zygote32.rc
 etc/boringssl_self_test.zygote64.rc
 etc/boringssl_self_test.zygote64_32.rc
-etc/bpf/filterPowerSupplyEvents.o
 etc/build_flags.json
 etc/default_volume_tables.xml
 etc/display_colordata_cal0.pb
@@ -319,13 +317,14 @@ etc/gnss/scd.conf
 etc/group
 etc/hearing_aid_audio_policy_configuration_7_0.xml
 etc/init.common.cfg
+etc/init.insmod.raven.cfg
 etc/init/android.hardware.audio.service.rc
 etc/init/android.hardware.boot-service.default-pixel.rc
 etc/init/android.hardware.cas@1.2-service.rc
 etc/init/android.hardware.drm-service.clearkey.rc
 etc/init/android.hardware.dumpstate-service.rc
 etc/init/android.hardware.gatekeeper-service.trusty.rc
-etc/init/android.hardware.graphics.allocator2-aidl-service.rc
+etc/init/android.hardware.graphics.allocator-aidl-service.rc
 etc/init/android.hardware.graphics.composer@2.4-service.rc
 etc/init/android.hardware.health-service.gs101.rc
 etc/init/android.hardware.media.omx@1.0-service.rc
@@ -338,30 +337,22 @@ etc/init/android.hardware.sensors-service-multihal.rc
 etc/init/android.hardware.thermal-service.pixel.rc
 etc/init/android.hardware.usb-service.rc
 etc/init/android.hardware.usb.gadget-service.rc
+etc/init/android.hardware.vibrator-service.cs40l25.rc
 etc/init/android.hardware.wifi-service.rc
 etc/init/android.hardware.wifi.supplicant-service.rc
 etc/init/atrace_categories.rc
 etc/init/boringssl_self_test.rc
-etc/init/dump_power.rc
 etc/init/gpu_probe.rc
 etc/init/health-storage-default.rc
 etc/init/hostapd.android.rc
 etc/init/hw/init.gs101.rc
-etc/init/hw/init.gs101.storage.rc
 etc/init/hw/init.gs101.usb.rc
 etc/init/hw/init.raven.rc
 etc/init/hw/init.raviole.rc
 etc/init/init.aoc.rc
-etc/init/init.fingerprint.dump.rc
 etc/init/init.module.rc
-etc/init/init.pixel-mm-gs.rc
-etc/init/init.pixel-perf.rc
 etc/init/init.pixel.rc
-etc/init/init.power-gs.rc
 etc/init/init.storage.rc
-etc/init/libg3a_gabc.rc
-etc/init/libg3a_gaf.rc
-etc/init/libg3a_ghawb.rc
 etc/init/memtrack.rc
 etc/init/nfc-service-default.rc
 etc/init/pixel-mm-gki.rc
@@ -370,9 +361,6 @@ etc/init/pixelstats-vendor.gs101.rc
 etc/init/pkvm_experiment.rc
 etc/init/rebalance_interrupts-vendor.gs101.rc
 etc/init/vndservicemanager.rc
-etc/libg3a_standalone_gabc_rc
-etc/libg3a_standalone_gaf_rc
-etc/libg3a_standalone_ghawb_rc
 etc/libnfc-hal-st.conf
 etc/libse-gto-hal.conf
 etc/libse-gto-hal2.conf
@@ -416,7 +404,7 @@ etc/permissions/android.hardware.camera.full.xml
 etc/permissions/android.hardware.camera.raw.xml
 etc/permissions/android.hardware.context_hub.xml
 etc/permissions/android.hardware.device_unique_attestation.xml
-etc/permissions/android.hardware.hardware_keystore_V3.xml
+etc/permissions/android.hardware.hardware_keystore.xml
 etc/permissions/android.hardware.keystore.app_attest_key.xml
 etc/permissions/android.hardware.location.gps.prebuilt.xml
 etc/permissions/android.hardware.nfc.ese.xml
@@ -450,6 +438,7 @@ etc/permissions/android.hardware.wifi.direct.xml
 etc/permissions/android.hardware.wifi.passpoint.xml
 etc/permissions/android.hardware.wifi.rtt.xml
 etc/permissions/android.hardware.wifi.xml
+etc/permissions/android.software.contextualsearch.xml
 etc/permissions/android.software.device_id_attestation.xml
 etc/permissions/android.software.ipsec_tunnel_migration.xml
 etc/permissions/android.software.ipsec_tunnels.xml
@@ -459,7 +448,6 @@ etc/permissions/android.software.verified_boot.xml
 etc/permissions/android.software.vulkan.deqp.level.xml
 etc/permissions/aosp_excluded_hardware.xml
 etc/permissions/com.nxp.mifare.xml
-etc/permissions/features_com.android.virt.xml
 etc/permissions/handheld_core_hardware.xml
 etc/permissions/vendor.android.hardware.camera.preview-dis.xml
 etc/powerhint-mainline.json
@@ -467,7 +455,6 @@ etc/powerhint.json
 etc/powerhint_a0.json
 etc/powerhint_a1.json
 etc/r_submix_audio_policy_configuration.xml
-etc/selinux/genfs_labels_version.txt
 etc/selinux/plat_pub_versioned.cil
 etc/selinux/plat_sepolicy_vers.txt
 etc/selinux/precompiled_sepolicy
@@ -477,7 +464,6 @@ etc/selinux/precompiled_sepolicy.system_ext_sepolicy_and_mapping.sha256
 etc/selinux/selinux_denial_metadata
 etc/selinux/vendor_file_contexts
 etc/selinux/vendor_hwservice_contexts
-etc/selinux/vendor_keystore2_key_contexts
 etc/selinux/vendor_mac_permissions.xml
 etc/selinux/vendor_property_contexts
 etc/selinux/vendor_seapp_contexts
@@ -561,13 +547,13 @@ etc/vintf/manifest/android.hardware.sensors-multihal.xml
 etc/vintf/manifest/android.hardware.thermal-service.pixel.xml
 etc/vintf/manifest/android.hardware.usb-service.xml
 etc/vintf/manifest/android.hardware.usb.gadget-service.xml
+etc/vintf/manifest/android.hardware.vibrator-service.cs40l25.xml
 etc/vintf/manifest/android.hardware.wifi-service.xml
 etc/vintf/manifest/android.hardware.wifi.hostapd.xml
 etc/vintf/manifest/android.hardware.wifi.supplicant.xml
 etc/vintf/manifest/bluetooth_audio.xml
 etc/vintf/manifest/health-storage-default.xml
-etc/vintf/manifest/manifest.xml
-etc/vintf/manifest/manifest_gralloc_aidl2.xml
+etc/vintf/manifest/manifest_gralloc_aidl.xml
 etc/vintf/manifest/memtrack.xml
 etc/vintf/manifest/nfc-service-default.xml
 etc/vintf/manifest/pixel-display-default.xml
@@ -588,7 +574,7 @@ firmware/cs35l41-dsp1-spk-prot.bin
 firmware/cs35l41-dsp1-spk-prot.wmfw
 firmware/readme.md
 lib/android.frameworks.stats-V2-ndk.so
-lib/android.hardware.audio.common-V4-ndk.so
+lib/android.hardware.audio.common-V3-ndk.so
 lib/android.hardware.audio.common-util.so
 lib/android.hardware.audio.common@2.0.so
 lib/android.hardware.audio.common@5.0.so
@@ -602,7 +588,7 @@ lib/android.hardware.audio.effect@7.0.so
 lib/android.hardware.audio@7.0.so
 lib/android.hardware.audio@7.1-util.so
 lib/android.hardware.audio@7.1.so
-lib/android.hardware.bluetooth.audio-V5-ndk.so
+lib/android.hardware.bluetooth.audio-V4-ndk.so
 lib/android.hardware.bluetooth.audio-impl.so
 lib/android.hardware.bluetooth.audio@2.0.so
 lib/android.hardware.bluetooth.audio@2.1.so
@@ -613,18 +599,18 @@ lib/android.hardware.cas@1.2.so
 lib/android.hardware.common-V2-ndk.so
 lib/android.hardware.common.fmq-V1-ndk.so
 lib/android.hardware.drm-V1-ndk.so
-lib/android.hardware.drm.common-V1-ndk.so
 lib/android.hardware.graphics.allocator-V2-ndk.so
 lib/android.hardware.graphics.allocator@2.0.so
 lib/android.hardware.graphics.allocator@3.0.so
 lib/android.hardware.graphics.allocator@4.0.so
 lib/android.hardware.graphics.bufferqueue@1.0.so
 lib/android.hardware.graphics.bufferqueue@2.0.so
-lib/android.hardware.graphics.common-V6-ndk.so
+lib/android.hardware.graphics.common-V3-ndk.so
+lib/android.hardware.graphics.common-V5-ndk.so
 lib/android.hardware.graphics.common@1.0.so
 lib/android.hardware.graphics.common@1.1.so
 lib/android.hardware.graphics.common@1.2.so
-lib/android.hardware.graphics.composer3-V4-ndk.so
+lib/android.hardware.graphics.composer3-V3-ndk.so
 lib/android.hardware.graphics.composer@2.1.so
 lib/android.hardware.graphics.composer@2.2.so
 lib/android.hardware.graphics.composer@2.3.so
@@ -650,12 +636,13 @@ lib/android.hidl.memory@1.0.so
 lib/android.hidl.safe_union@1.0.so
 lib/android.hidl.token@1.0-utils.so
 lib/android.hidl.token@1.0.so
-lib/android.media.audio.common.types-V4-ndk.so
+lib/android.media.audio.common.types-V3-ndk.so
 lib/android.system.suspend-V1-ndk.so
 lib/arm.graphics-V1-ndk.so
-lib/com.google.hardware.pixel.display-V13-ndk.so
+lib/com.google.hardware.pixel.display-V10-ndk.so
 lib/hw/android.hardware.audio.effect@7.0-impl.so
 lib/hw/android.hardware.audio@7.1-impl.so
+lib/hw/android.hardware.graphics.mapper@4.0-impl.so
 lib/hw/android.hardware.soundtrigger@2.3-impl.so
 lib/hw/android.hidl.memory@1.0-impl.so
 lib/hw/audio.bluetooth.default.so
@@ -666,12 +653,9 @@ lib/hw/audio.usbv2.default.so
 lib/hw/gralloc.default.so
 lib/hw/hwcomposer.gs101.so
 lib/hw/local_time.default.so
-lib/hw/mapper.pixel.so
 lib/hw/power.default.so
 lib/hw/vibrator.default.so
 lib/libExynosHWCService.so
-lib/libOpenCL.so
-lib/libaconfig_storage_read_api_cc.so
 lib/libacryl.so
 lib/libacryl_hdr_plugin.so
 lib/libalsautils.so
@@ -735,8 +719,6 @@ lib/libxml2.so
 lib/libz.so
 lib/mediacas/libclearkeycasplugin.so
 lib/mediadrm/libdrmclearkeyplugin.so
-lib/modules/6lowpan.ko
-lib/modules/8021q.ko
 lib/modules/abrolhos.ko
 lib/modules/acpm_flexpmu_dbg.ko
 lib/modules/acpm_mbox_test.ko
@@ -746,59 +728,38 @@ lib/modules/aoc_channel_dev.ko
 lib/modules/aoc_char_dev.ko
 lib/modules/aoc_control_dev.ko
 lib/modules/aoc_core.ko
-lib/modules/aoc_tbn_service_dev.ko
-lib/modules/aoc_unit_test_dev.ko
 lib/modules/aoc_usb_driver.ko
 lib/modules/aoc_uwb_platform_drv.ko
 lib/modules/aoc_uwb_service_dev.ko
-lib/modules/aqc111.ko
+lib/modules/arm-memlat-mon.ko
 lib/modules/arm_dsu_pmu.ko
-lib/modules/asix.ko
 lib/modules/at24.ko
 lib/modules/audiometrics.ko
-lib/modules/ax88179_178a.ko
-lib/modules/bbd_pps_gpio.ko
 lib/modules/bc_max77759.ko
 lib/modules/bcm47765.ko
 lib/modules/bcm_dbg.ko
 lib/modules/bcmdhd4389.ko
-lib/modules/bigwave.ko
-lib/modules/bluetooth.ko
+lib/modules/bigocean.ko
 lib/modules/boot_control_sysfs.ko
 lib/modules/boot_device_spi.ko
-lib/modules/bsd_comp.ko
-lib/modules/btbcm.ko
-lib/modules/btqca.ko
 lib/modules/bts.ko
-lib/modules/btsdio.ko
-lib/modules/can-bcm.ko
-lib/modules/can-dev.ko
-lib/modules/can-gw.ko
-lib/modules/can-raw.ko
-lib/modules/can.ko
-lib/modules/cdc-acm.ko
-lib/modules/cdc_eem.ko
-lib/modules/cdc_ether.ko
-lib/modules/cdc_ncm.ko
-lib/modules/cfg80211.ko
-lib/modules/cl_dsp-core.ko
-lib/modules/clk_exynos_gs.ko
+lib/modules/clk_exynos.ko
 lib/modules/cmupmucal.ko
+lib/modules/coresight-etm4x.ko
+lib/modules/coresight-funnel.ko
+lib/modules/coresight-replicator.ko
+lib/modules/coresight-tmc.ko
+lib/modules/coresight.ko
 lib/modules/cp_thermal_zone.ko
 lib/modules/cpif.ko
 lib/modules/cpif_page.ko
-lib/modules/cs40l26-core.ko
-lib/modules/cs40l26-i2c.ko
 lib/modules/dbgcore-dump.ko
 lib/modules/debug-reboot.ko
 lib/modules/debug-snapshot-debug-kinfo.ko
 lib/modules/debug-snapshot-qd.ko
 lib/modules/debug-snapshot-sfrdump.ko
-lib/modules/diag.ko
-lib/modules/drm_display_helper.ko
 lib/modules/drv2624.ko
 lib/modules/dss.ko
-lib/modules/dw3000-core-tests.ko
 lib/modules/dw3000.ko
 lib/modules/dwc3-exynos-usb.ko
 lib/modules/ect_parser.ko
@@ -814,7 +775,6 @@ lib/modules/exynos-cpuhp.ko
 lib/modules/exynos-cpupm.ko
 lib/modules/exynos-debug-test.ko
 lib/modules/exynos-dm.ko
-lib/modules/exynos-drm-audio.ko
 lib/modules/exynos-drm.ko
 lib/modules/exynos-ecc-handler.ko
 lib/modules/exynos-pd-dbg.ko
@@ -823,6 +783,7 @@ lib/modules/exynos-pd_el3.ko
 lib/modules/exynos-pd_hsi0.ko
 lib/modules/exynos-pm.ko
 lib/modules/exynos-pmu-if.ko
+lib/modules/exynos-reboot.ko
 lib/modules/exynos-seclog.ko
 lib/modules/exynos_devfreq.ko
 lib/modules/exynos_dit.ko
@@ -832,7 +793,6 @@ lib/modules/exynos_pm_qos.ko
 lib/modules/exynos_tty.ko
 lib/modules/exyswd-rng.ko
 lib/modules/fips140.ko
-lib/modules/ftdi_sio.ko
 lib/modules/ftm5.ko
 lib/modules/g2d.ko
 lib/modules/goodixfp.ko
@@ -842,50 +802,33 @@ lib/modules/google-bms.ko
 lib/modules/google-charger.ko
 lib/modules/google-cpm.ko
 lib/modules/google_bcl.ko
-lib/modules/google_ccd.ko
 lib/modules/google_dock.ko
 lib/modules/google_dual_batt_gauge.ko
-lib/modules/google_tcpci_shim.ko
+lib/modules/governor_memlat.ko
 lib/modules/gpu_cooling.ko
 lib/modules/gs-chipid.ko
-lib/modules/gs-drm-connector.ko
-lib/modules/gs-panel.ko
 lib/modules/gs101_spmic_thermal.ko
 lib/modules/gs_acpm.ko
-lib/modules/gs_governor_memlat.ko
-lib/modules/gs_governor_utils.ko
-lib/modules/gs_perf_mon.ko
 lib/modules/gs_thermal.ko
 lib/modules/gsa.ko
 lib/modules/gsa_gsc.ko
 lib/modules/gsc-spi.ko
 lib/modules/gvotable.ko
-lib/modules/gzvm.ko
 lib/modules/haptics-cs40l2x.ko
 lib/modules/hardlockup-debug.ko
 lib/modules/hardlockup-watchdog.ko
-lib/modules/hci_uart.ko
 lib/modules/heatmap.ko
-lib/modules/hidp.ko
 lib/modules/i2c-acpm.ko
 lib/modules/i2c-dev.ko
 lib/modules/i2c-exynos5.ko
-lib/modules/ieee802154.ko
-lib/modules/ieee802154_6lowpan.ko
-lib/modules/ieee802154_socket.ko
 lib/modules/itmon.ko
 lib/modules/kernel-top.ko
 lib/modules/keycombo.ko
 lib/modules/keydebug.ko
-lib/modules/kheaders.ko
-lib/modules/l2tp_core.ko
-lib/modules/l2tp_ppp.ko
-lib/modules/libarc4.ko
-lib/modules/ln8411.ko
 lib/modules/logbuffer.ko
 lib/modules/lwis.ko
-lib/modules/mac80211.ko
-lib/modules/mac802154.ko
+lib/modules/lzo-rle.ko
+lib/modules/lzo.ko
 lib/modules/mailbox-wc.ko
 lib/modules/mali_kbase.ko
 lib/modules/mali_kutf.ko
@@ -896,72 +839,44 @@ lib/modules/max20339.ko
 lib/modules/max77729-pmic.ko
 lib/modules/max77729_charger.ko
 lib/modules/max77729_uic.ko
-lib/modules/max77759-charger.ko
+lib/modules/max77759_charger.ko
 lib/modules/max77759_contaminant.ko
 lib/modules/max77759_helper.ko
-lib/modules/max77779-charger-i2c.ko
-lib/modules/max77779-charger.ko
-lib/modules/max77779-fg-i2c.ko
-lib/modules/max77779-fg.ko
-lib/modules/max77779-fwupdate.ko
-lib/modules/max77779-sp-i2c.ko
-lib/modules/max77779-sp.ko
-lib/modules/max77779-vimon-i2c.ko
-lib/modules/max77779-vimon.ko
-lib/modules/max77779_contaminant.ko
-lib/modules/max77779_i2cm.ko
-lib/modules/max77779_i2cm_i2c.ko
-lib/modules/max77779_pmic.ko
-lib/modules/max77779_pmic_i2c.ko
-lib/modules/max77779_pmic_irq.ko
-lib/modules/max77779_pmic_pinctrl.ko
-lib/modules/max77779_pmic_sgpio.ko
-lib/modules/max777x9_contaminant.ko
 lib/modules/max77826-gs-regulator.ko
 lib/modules/mcps802154.ko
 lib/modules/mcps802154_region_fira.ko
 lib/modules/mcps802154_region_nfcc_coex.ko
 lib/modules/mcps802154_region_pctt.ko
-lib/modules/mii.ko
+lib/modules/memlat-devfreq.ko
 lib/modules/modules.alias
 lib/modules/modules.blocklist
 lib/modules/modules.dep
 lib/modules/modules.load
 lib/modules/modules.softdep
-lib/modules/nfc.ko
-lib/modules/nhc_dest.ko
-lib/modules/nhc_fragment.ko
-lib/modules/nhc_hop.ko
-lib/modules/nhc_ipv6.ko
-lib/modules/nhc_mobility.ko
-lib/modules/nhc_routing.ko
-lib/modules/nhc_udp.ko
 lib/modules/nitrous.ko
-lib/modules/odpm-whi.ko
+lib/modules/odpm.ko
+lib/modules/overheat_mitigation.ko
 lib/modules/p9221.ko
 lib/modules/panel-boe-nt37290.ko
-lib/modules/panel-common.ko
 lib/modules/panel-samsung-drv.ko
 lib/modules/panel-samsung-emul.ko
 lib/modules/panel-samsung-s6e3fc3-p10.ko
 lib/modules/panel-samsung-s6e3fc3.ko
-lib/modules/panel-samsung-s6e3fc3_6a.ko
 lib/modules/panel-samsung-s6e3hc2.ko
 lib/modules/panel-samsung-s6e3hc3-c10.ko
 lib/modules/panel-samsung-s6e3hc3.ko
 lib/modules/panel-samsung-s6e3hc4.ko
 lib/modules/panel-samsung-sofef01.ko
 lib/modules/pca9468.ko
-lib/modules/pcie-exynos-gs.ko
+lib/modules/pcie-exynos-core.ko
 lib/modules/pcie-exynos-gs101-rc-cal.ko
 lib/modules/phy-exynos-mipi-dsim.ko
 lib/modules/phy-exynos-mipi.ko
 lib/modules/phy-exynos-usbdrd-super.ko
-lib/modules/pinctrl-exynos-gs.ko
+lib/modules/pinctrl-samsung-core.ko
 lib/modules/pinctrl-slg51000.ko
 lib/modules/pixel-boot-metrics.ko
 lib/modules/pixel-debug-test.ko
-lib/modules/pixel-reboot.ko
 lib/modules/pixel-suspend-diag.ko
 lib/modules/pixel_em.ko
 lib/modules/pixel_metrics.ko
@@ -971,25 +886,16 @@ lib/modules/pktgen.ko
 lib/modules/pl330.ko
 lib/modules/pmic_class.ko
 lib/modules/power_stats.ko
-lib/modules/ppp_deflate.ko
-lib/modules/ppp_generic.ko
-lib/modules/ppp_mppe.ko
-lib/modules/pppox.ko
-lib/modules/pptp.ko
-lib/modules/r8152.ko
-lib/modules/r8153_ecm.ko
-lib/modules/rfcomm.ko
-lib/modules/rfkill.ko
-lib/modules/rt9471_charger.ko
+lib/modules/pps-gpio.ko
+lib/modules/pps_core.ko
 lib/modules/rtc-s2mpg10.ko
-lib/modules/rtl8150.ko
 lib/modules/s2mpg10-mfd.ko
 lib/modules/s2mpg10-powermeter.ko
 lib/modules/s2mpg10-regulator.ko
 lib/modules/s2mpg11-mfd.ko
 lib/modules/s2mpg11-powermeter.ko
 lib/modules/s2mpg11-regulator.ko
-lib/modules/s2mpg1x-gpio.ko
+lib/modules/s2mpg1x-gpio-gs101.ko
 lib/modules/s2mpu.ko
 lib/modules/s3c2410_wdt.ko
 lib/modules/samsung-dma.ko
@@ -1007,24 +913,23 @@ lib/modules/slc_acpm.ko
 lib/modules/slc_dummy.ko
 lib/modules/slc_pmon.ko
 lib/modules/slc_pt.ko
-lib/modules/slcan.ko
 lib/modules/slg46826.ko
 lib/modules/slg51000-core.ko
 lib/modules/slg51000-regulator.ko
-lib/modules/slhc.ko
 lib/modules/smfc.ko
 lib/modules/snd-soc-cs35l41-i2c.ko
 lib/modules/snd-soc-cs35l41-spi.ko
 lib/modules/snd-soc-cs35l41.ko
-lib/modules/snd-soc-cs40l26.ko
+lib/modules/snd-soc-max98357a.ko
+lib/modules/snd-soc-rl6231.ko
+lib/modules/snd-soc-rt5682-i2c.ko
+lib/modules/snd-soc-rt5682.ko
 lib/modules/snd-soc-wm-adsp.ko
 lib/modules/snd_soc_cs40l2x.ko
 lib/modules/softdog.ko
 lib/modules/spi-s3c64xx.ko
 lib/modules/spidev.ko
 lib/modules/sscoredump.ko
-lib/modules/sscoredump_sample_test.ko
-lib/modules/sscoredump_test.ko
 lib/modules/st21nfc.ko
 lib/modules/st33spi.ko
 lib/modules/st54spi.ko
@@ -1033,7 +938,6 @@ lib/modules/sysrq-hook.ko
 lib/modules/systrace.ko
 lib/modules/tcpci_fusb307.ko
 lib/modules/tcpci_max77759.ko
-lib/modules/tipc.ko
 lib/modules/touch_bus_negotiator.ko
 lib/modules/touch_offload.ko
 lib/modules/trusty-core.ko
@@ -1041,28 +945,24 @@ lib/modules/trusty-ipc.ko
 lib/modules/trusty-log.ko
 lib/modules/trusty-test.ko
 lib/modules/trusty-virtio.ko
-lib/modules/ufs-exynos-gs.ko
+lib/modules/ufs-exynos-core.ko
 lib/modules/ufs-pixel-fips140.ko
 lib/modules/usb_f_dm.ko
 lib/modules/usb_f_dm1.ko
 lib/modules/usb_f_etr_miu.ko
+lib/modules/usb_f_rndis.ko
 lib/modules/usb_psy.ko
 lib/modules/usbc_cooling_dev.ko
-lib/modules/usbnet.ko
-lib/modules/usbserial.ko
-lib/modules/vcan.ko
 lib/modules/vh_cgroup.ko
 lib/modules/vh_fs.ko
 lib/modules/vh_mm.ko
 lib/modules/vh_preemptirq_long.ko
 lib/modules/vh_sched.ko
 lib/modules/vh_thermal.ko
-lib/modules/wwan.ko
 lib/modules/xhci-exynos.ko
 lib/modules/zcomp_cpu.ko
 lib/modules/zcomp_eh.ko
 lib/modules/zram.ko
-lib/modules/zram_gs.ko
 lib/modules/zsmalloc.ko
 lib/pixel-power-ext-V1-ndk.so
 lib/pixel_stateresidency_provider_aidl_interface-ndk.so
@@ -1077,10 +977,11 @@ lib/soundfx/libhapticgenerator.so
 lib/soundfx/libldnhncr.so
 lib/soundfx/libreverbwrapper.so
 lib/soundfx/libvisualizer.so
+lib64/PixelVibratorStats.so
 lib64/android.frameworks.sensorservice-V1-ndk.so
 lib64/android.frameworks.stats-V1-ndk.so
 lib64/android.frameworks.stats-V2-ndk.so
-lib64/android.hardware.audio.common-V4-ndk.so
+lib64/android.hardware.audio.common-V3-ndk.so
 lib64/android.hardware.audio.common-util.so
 lib64/android.hardware.audio.common@2.0.so
 lib64/android.hardware.audio.common@5.0.so
@@ -1094,7 +995,7 @@ lib64/android.hardware.audio.effect@7.0.so
 lib64/android.hardware.audio@7.0.so
 lib64/android.hardware.audio@7.1-util.so
 lib64/android.hardware.audio@7.1.so
-lib64/android.hardware.bluetooth.audio-V5-ndk.so
+lib64/android.hardware.bluetooth.audio-V4-ndk.so
 lib64/android.hardware.bluetooth.audio-impl.so
 lib64/android.hardware.bluetooth.audio@2.0.so
 lib64/android.hardware.bluetooth.audio@2.1.so
@@ -1104,18 +1005,19 @@ lib64/android.hardware.boot@1.1.so
 lib64/android.hardware.common-V2-ndk.so
 lib64/android.hardware.common.fmq-V1-ndk.so
 lib64/android.hardware.drm-V1-ndk.so
-lib64/android.hardware.drm.common-V1-ndk.so
 lib64/android.hardware.dumpstate-V1-ndk.so
 lib64/android.hardware.gatekeeper-V1-ndk.so
+lib64/android.hardware.graphics.allocator-V1-ndk.so
 lib64/android.hardware.graphics.allocator-V2-ndk.so
 lib64/android.hardware.graphics.allocator@2.0.so
 lib64/android.hardware.graphics.allocator@3.0.so
 lib64/android.hardware.graphics.allocator@4.0.so
-lib64/android.hardware.graphics.common-V6-ndk.so
+lib64/android.hardware.graphics.common-V3-ndk.so
+lib64/android.hardware.graphics.common-V5-ndk.so
 lib64/android.hardware.graphics.common@1.0.so
 lib64/android.hardware.graphics.common@1.1.so
 lib64/android.hardware.graphics.common@1.2.so
-lib64/android.hardware.graphics.composer3-V4-ndk.so
+lib64/android.hardware.graphics.composer3-V3-ndk.so
 lib64/android.hardware.graphics.composer@2.1-resources.so
 lib64/android.hardware.graphics.composer@2.1.so
 lib64/android.hardware.graphics.composer@2.2-resources.so
@@ -1126,13 +1028,13 @@ lib64/android.hardware.graphics.mapper@2.0.so
 lib64/android.hardware.graphics.mapper@2.1.so
 lib64/android.hardware.graphics.mapper@3.0.so
 lib64/android.hardware.graphics.mapper@4.0.so
-lib64/android.hardware.health-V4-ndk.so
+lib64/android.hardware.health-V3-ndk.so
 lib64/android.hardware.health.storage-V1-ndk.so
 lib64/android.hardware.memtrack-V1-ndk.so
 lib64/android.hardware.nfc-V1-ndk.so
 lib64/android.hardware.power-V1-ndk.so
 lib64/android.hardware.power-V2-ndk.so
-lib64/android.hardware.power-V6-ndk.so
+lib64/android.hardware.power-V5-ndk.so
 lib64/android.hardware.power.stats-V2-ndk.so
 lib64/android.hardware.power.stats-impl.gs-common.so
 lib64/android.hardware.power.stats-impl.gs101.so
@@ -1144,11 +1046,11 @@ lib64/android.hardware.secure_element@1.0.so
 lib64/android.hardware.secure_element@1.1.so
 lib64/android.hardware.secure_element@1.2.so
 lib64/android.hardware.security.keymint-V1-ndk.so
-lib64/android.hardware.security.keymint-V4-ndk.so
+lib64/android.hardware.security.keymint-V3-ndk.so
 lib64/android.hardware.security.rkp-V3-ndk.so
 lib64/android.hardware.security.secureclock-V1-ndk.so
 lib64/android.hardware.security.sharedsecret-V1-ndk.so
-lib64/android.hardware.sensors-V3-ndk.so
+lib64/android.hardware.sensors-V2-ndk.so
 lib64/android.hardware.sensors@1.0.so
 lib64/android.hardware.sensors@2.0-ScopedWakelock.so
 lib64/android.hardware.sensors@2.0.so
@@ -1159,29 +1061,32 @@ lib64/android.hardware.soundtrigger@2.1.so
 lib64/android.hardware.soundtrigger@2.2.so
 lib64/android.hardware.soundtrigger@2.3.so
 lib64/android.hardware.thermal-V1-ndk.so
-lib64/android.hardware.thermal-V3-ndk.so
+lib64/android.hardware.thermal-V2-ndk.so
 lib64/android.hardware.thermal@1.0.so
 lib64/android.hardware.thermal@2.0.so
 lib64/android.hardware.usb-V3-ndk.so
 lib64/android.hardware.usb.gadget-V1-ndk.so
 lib64/android.hardware.usb.gadget@1.0.so
-lib64/android.hardware.wifi-V3-ndk.so
-lib64/android.hardware.wifi.common-V2-ndk.so
-lib64/android.hardware.wifi.hostapd-V3-ndk.so
-lib64/android.hardware.wifi.supplicant-V4-ndk.so
+lib64/android.hardware.vibrator-V2-ndk.so
+lib64/android.hardware.wifi-V2-ndk.so
+lib64/android.hardware.wifi.common-V1-ndk.so
+lib64/android.hardware.wifi.hostapd-V2-ndk.so
+lib64/android.hardware.wifi.supplicant-V3-ndk.so
 lib64/android.hidl.allocator@1.0.so
 lib64/android.hidl.memory.token@1.0.so
 lib64/android.hidl.memory@1.0.so
 lib64/android.hidl.safe_union@1.0.so
-lib64/android.media.audio.common.types-V4-ndk.so
+lib64/android.media.audio.common.types-V3-ndk.so
 lib64/android.system.keystore2-V1-ndk.so
 lib64/android.system.suspend-V1-ndk.so
 lib64/arm.graphics-V1-ndk.so
-lib64/com.google.hardware.pixel.display-V13-ndk.so
+lib64/com.google.hardware.pixel.display-V10-ndk.so
 lib64/hw/android.hardware.audio.effect@7.0-impl.so
 lib64/hw/android.hardware.audio@7.1-impl.so
 lib64/hw/android.hardware.graphics.allocator-aidl-impl.so
+lib64/hw/android.hardware.graphics.mapper@4.0-impl.so
 lib64/hw/android.hardware.soundtrigger@2.3-impl.so
+lib64/hw/android.hardware.vibrator-impl.cs40l25.so
 lib64/hw/android.hidl.memory@1.0-impl.so
 lib64/hw/audio.bluetooth.default.so
 lib64/hw/audio.primary.default.so
@@ -1191,13 +1096,10 @@ lib64/hw/audio.usbv2.default.so
 lib64/hw/gralloc.default.so
 lib64/hw/hwcomposer.gs101.so
 lib64/hw/local_time.default.so
-lib64/hw/mapper.pixel.so
 lib64/hw/power.default.so
 lib64/hw/vibrator.default.so
 lib64/libExynosHWCService.so
-lib64/libOpenCL.so
 lib64/lib_android_keymaster_keymint_utils.so
-lib64/libaconfig_storage_read_api_cc.so
 lib64/libacryl.so
 lib64/libacryl_hdr_plugin.so
 lib64/libalsautils.so
@@ -1213,6 +1115,8 @@ lib64/libbluetooth_audio_session_aidl.so
 lib64/libc++.so
 lib64/libcfg_if.dylib.so
 lib64/libclang_rt.ubsan_standalone-aarch64-android.so
+lib64/libcppbor_external.so
+lib64/libcppcose_rkp.so
 lib64/libcrypto.so
 lib64/libcutils.so
 lib64/libdisppower-pixel.so
@@ -1239,7 +1143,8 @@ lib64/libhwjpeg.so
 lib64/libion_google.so
 lib64/libjsoncpp.so
 lib64/libkeymaster_messages.so
-lib64/libkeymasterconfig.so
+lib64/libkeymaster_portable.so
+lib64/libkeymint.so
 lib64/libkeystore-engine-wifi-hidl.so
 lib64/liblibloading.dylib.so
 lib64/liblog_rust.dylib.so
@@ -1259,10 +1164,12 @@ lib64/libpower.so
 lib64/libprocessgroup.so
 lib64/libprotobuf-cpp-full-21.12.so
 lib64/libprotobuf-cpp-lite-21.12.so
+lib64/libpuresoftkeymasterdevice.so
 lib64/libreference-ril.so
 lib64/libril.so
 lib64/librilutils.so
 lib64/libsensorndkbridge.so
+lib64/libsoft_attestation_cert.so
 lib64/libspeexresampler.so
 lib64/libssl.so
 lib64/libstagefright_foundation.so
@@ -1303,42 +1210,27 @@ lib64/soundfx/libvisualizer.so
 odm/etc/build.prop
 odm/etc/group
 odm/etc/passwd
-odm/etc/selinux/odm_file_contexts
-odm/etc/selinux/odm_hwservice_contexts
-odm/etc/selinux/odm_mac_permissions.xml
-odm/etc/selinux/odm_property_contexts
-odm/etc/selinux/odm_seapp_contexts
-odm/etc/selinux/odm_sepolicy.cil
-odm/etc/selinux/odm_service_contexts
 odm_dlkm/etc/build.prop
+overlay/EmergencyInfo__raven__auto_generated_rro_vendor.apk
+overlay/NfcNci__raven__auto_generated_rro_vendor.apk
+overlay/ONS__raven__auto_generated_rro_vendor.apk
+overlay/Settings__raven__auto_generated_rro_vendor.apk
+overlay/StorageManager__raven__auto_generated_rro_vendor.apk
+overlay/SystemUI__raven__auto_generated_rro_vendor.apk
+overlay/TeleService__raven__auto_generated_rro_vendor.apk
+overlay/Traceur__raven__auto_generated_rro_vendor.apk
+overlay/framework-res__raven__auto_generated_rro_vendor.apk
 vendor_dlkm/etc/build.prop
-vendor_dlkm/etc/init.insmod.raven.cfg
 
 # Exclude overlays, symlinks and extra files that we override
 
 # Overlays
-overlay/DMService__raven__auto_generated_rro_vendor.apk
 overlay/DeviceDiagnostics__raven__auto_generated_rro_vendor.apk
+overlay/DMService__raven__auto_generated_rro_vendor.apk
 overlay/Flipendo__raven__auto_generated_rro_vendor.apk
-overlay/ONS__raven__auto_generated_rro_vendor.apk
 overlay/SettingsGoogle__raven__auto_generated_rro_vendor.apk
 overlay/StorageManagerGoogle__raven__auto_generated_rro_vendor.apk
 overlay/SystemUIGoogle__raven__auto_generated_rro_vendor.apk
-overlay/TeleService__raven__auto_generated_rro_vendor.apk
-overlay/Traceur__raven__auto_generated_rro_vendor.apk
-overlay/framework-res__raven__auto_generated_rro_vendor.apk
-
-# beta
-overlay/DMService__raven_beta__auto_generated_rro_vendor.apk
-overlay/DeviceDiagnostics__raven_beta__auto_generated_rro_vendor.apk
-overlay/Flipendo__raven_beta__auto_generated_rro_vendor.apk
-overlay/ONS__raven_beta__auto_generated_rro_vendor.apk
-overlay/SettingsGoogle__raven_beta__auto_generated_rro_vendor.apk
-overlay/StorageManagerGoogle__raven_beta__auto_generated_rro_vendor.apk
-overlay/SystemUIGoogle__raven_beta__auto_generated_rro_vendor.apk
-overlay/TeleService__raven_beta__auto_generated_rro_vendor.apk
-overlay/Traceur__raven_beta__auto_generated_rro_vendor.apk
-overlay/framework-res__raven_beta__auto_generated_rro_vendor.apk
 
 # Symlinks
 lib/modules
@@ -1356,10 +1248,12 @@ lib64/libtinycompress.so
 
 # Bluetooth
 lib64/android.hardware.bluetooth-V1-ndk.so
-lib64/android.hardware.bluetooth.finder-V1-ndk.so
-lib64/android.hardware.bluetooth.ranging-V1-ndk.so
 lib64/hardware.google.bluetooth.bt_channel_avoidance@1.0.so
 
+# Camera
+lib/libGralloc4Wrapper.so
+lib64/libGralloc4Wrapper.so
+
 # Charger
 etc/res/images/charger/battery_fail.png
 etc/res/images/charger/battery_scale.png
@@ -1367,6 +1261,7 @@ etc/res/images/charger/main_font.png
 etc/res/values/charger/animation.txt
 
 # Codec2
+lib/android.hardware.media.bufferpool2-V1-ndk.so
 lib/android.hardware.media.bufferpool2-V2-ndk.so
 lib/android.hardware.media.bufferpool@2.0.so
 lib/android.hardware.media.c2-V1-ndk.so
@@ -1382,6 +1277,7 @@ lib/libmedia_ecoservice.so
 lib/libsfplugin_ccodec_utils.so
 lib/libstagefright_aidl_bufferpool2.so
 lib/libstagefright_bufferpool@2.0.1.so
+lib64/android.hardware.media.bufferpool2-V1-ndk.so
 lib64/android.hardware.media.bufferpool2-V2-ndk.so
 lib64/android.hardware.media.bufferpool@2.0.so
 lib64/android.hardware.media.c2-V1-ndk.so
@@ -1393,7 +1289,6 @@ lib64/android.hardware.media@1.0.so
 lib64/libavservices_minijail.so
 lib64/libcap.so
 lib64/libcodec2.so
-lib64/libcodec2_aidl.so
 lib64/libcodec2_hal_common.so
 lib64/libcodec2_hidl@1.0.so
 lib64/libcodec2_hidl@1.1.so
@@ -1421,11 +1316,9 @@ lib64/android.hardware.confirmationui@1.0.so
 lib64/libteeui_hal_support.so
 
 # Contexthub
-lib/android.hardware.contexthub-V3-ndk.so
-lib/android.hardware.contexthub-V4-ndk.so
 lib64/android.hardware.contexthub-V3-ndk.so
-lib64/android.hardware.contexthub-V4-ndk.so
 lib64/chre_atoms_log.so
+lib64/chre_metrics_reporter.so
 lib64/chremetrics-cpp.so
 
 # Fingerprint
@@ -1441,17 +1334,18 @@ lib/libhwbinder.so
 lib64/libhidltransport.so
 lib64/libhwbinder.so
 
+# Identity credential
+etc/permissions/android.hardware.identity_credential.xml
+lib64/android.hardware.identity-V5-ndk.so
+lib64/android.hardware.identity-support-lib.so
+
 # Json
 lib/libjsoncpp.so
 lib64/libjson.so
 
 # Nos
-lib64/android.hardware.security.keymint-V3-ndk.so
-lib64/libcppbor.so
-lib64/libcppcose_rkp.so
-lib64/libkeymaster_portable.so
+lib64/libkeymaster4support.so
 lib64/libkeymint_support.so
-lib64/libkeymint_support_V3.so
 lib64/libnos.so
 lib64/libnos_client_citadel.so
 lib64/libnos_datagram.so
@@ -1460,7 +1354,9 @@ lib64/libnos_feature.so
 lib64/libnos_transport.so
 lib64/libnosprotos.so
 lib64/nos_app_avb.so
+lib64/nos_app_identity.so
 lib64/nos_app_keymaster.so
+lib64/nos_app_keymaster_ctdl.so
 lib64/nos_app_weaver.so
 lib64/pixelpowerstats_provider_aidl_interface-cpp.so
 
@@ -1481,7 +1377,7 @@ lib64/modem_clock_manager_impl.so
 
 # Sensors
 lib/android.frameworks.sensorservice-V1-ndk.so
-lib/android.hardware.sensors-V3-ndk.so
+lib/android.hardware.sensors-V2-ndk.so
 lib/android.hardware.sensors@1.0.so
 lib/android.hardware.sensors@2.0-ScopedWakelock.so
 lib/android.hardware.sensors@2.0.so
@@ -1489,7 +1385,6 @@ lib/android.hardware.sensors@2.1.so
 lib/hw/sensors.dynamic_sensor_hal.so
 lib/libhidparser.so
 lib/libsensorndkbridge.so
-lib64/android.hardware.sensors-V2-ndk.so
 lib64/hw/sensors.dynamic_sensor_hal.so
 lib64/libhidparser.so
 
@@ -1523,17 +1418,18 @@ lib/android.hardware.thermal@2.0.so
 lib/com.google.hardware.pixel.display-V9-ndk.so
 lib64/android.frameworks.stats-V1-cpp.so
 lib64/android.hardware.authsecret-V1-ndk.so
-lib64/android.hardware.biometrics.common-V3-ndk.so
-lib64/android.hardware.biometrics.fingerprint-V3-ndk.so
+lib64/android.hardware.biometrics.common-V2-ndk.so
+lib64/android.hardware.biometrics.fingerprint-V2-ndk.so
 lib64/android.hardware.gnss-V3-ndk.so
 lib64/android.hardware.graphics.bufferqueue@1.0.so
 lib64/android.hardware.graphics.bufferqueue@2.0.so
 lib64/android.hardware.health-V1-ndk.so
 lib64/android.hardware.input.common-V1-ndk.so
 lib64/android.hardware.input.processor-V1-ndk.so
-lib64/android.hardware.keymaster-V4-ndk.so
+lib64/android.hardware.keymaster-V3-ndk.so
 lib64/android.hardware.keymaster@3.0.so
 lib64/android.hardware.keymaster@4.0.so
+lib64/android.hardware.keymaster@4.1.so
 lib64/android.hardware.neuralnetworks-V4-ndk.so
 lib64/android.hardware.neuralnetworks@1.0.so
 lib64/android.hardware.neuralnetworks@1.1.so
@@ -1552,8 +1448,8 @@ lib64/android.hardware.radio@1.3.so
 lib64/android.hardware.radio@1.4.so
 lib64/android.hardware.radio@1.5.so
 lib64/android.hardware.radio@1.6.so
-lib64/android.hardware.vibrator-V2-ndk.so
 lib64/android.hardware.weaver-V2-ndk.so
+lib64/android.hardware.wifi-V1-ndk.so
 lib64/android.hidl.token@1.0-utils.so
 lib64/android.hidl.token@1.0.so
 lib64/com.google.hardware.pixel.display-V4-ndk.so
@@ -1566,12 +1462,6 @@ lib/libion.so
 lib64/libevent.so
 lib64/libion.so
 
-# Odex
-framework/oat/arm/com.google.android.camera.experimental2021.odex
-framework/oat/arm/com.google.android.camera.experimental2021.vdex
-framework/oat/arm64/com.google.android.camera.experimental2021.odex
-framework/oat/arm64/com.google.android.camera.experimental2021.vdex
-
 # Completely skip files that are not required
 
 # Edge TPU
@@ -1580,9 +1470,6 @@ lib/libedgetpu_util.so
 # Google
 etc/default-permissions/default-permissions_talkback.xml
 
-# GXP
-lib64/libgxp.so
-
 # Secure element
 lib/android.hardware.secure_element.thales.libse.so
 lib/libstpreprocess21.so

raven/vendor.prop

@@ -9,5 +9,8 @@ persist.vendor.ril.use_radio_hal=1.6
 ro.vendor.config.build_carrier=europen
 vendor.rild.libpath=libsitril.so
 
+# SSR
+vendor.debug.ssrdump.type=sscoredump
+
 # UWB
 ro.vendor.uwb.calibration.calibrationpaths=/vendor/etc/uwb/calib_paths

raven_generic.mk

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

slider/BoardConfig.mk

@@ -15,6 +15,13 @@
 #
 TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
 TARGET_BOOTLOADER_BOARD_NAME := slider
+ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
+else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
+else
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
+endif
 TARGET_SCREEN_DENSITY := 560
 USES_DEVICE_GOOGLE_RAVIOLE := true
 
@@ -23,4 +30,3 @@ BOARD_BOOTCONFIG += androidboot.selinux=permissive
 include device/google/gs101/BoardConfig-common.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

slider_generic.mk

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