lynx: Initialize for Evolution X 11.x

Signed-off-by: AnierinB <anierin@evolution-x.org>
lynx: We don't support udfps touch handler
2025-09-26 04:54:41 +00:00 · 2025-08-28 21:09:13 +00:00 · 2025-08-28 16:16:16 +03:00 · 2025-08-13 02:22:25 +00:00 · 2025-07-09 16:02:42 +03:00 · 2025-07-06 12:59:16 +03:00
63 changed files with 921 additions and 274066 deletions
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -16,9 +16,4 @@

 PRODUCT_MAKEFILES := \
    $(LOCAL_DIR)/aosp_lynx.mk \
-    $(LOCAL_DIR)/aosp_lynx_hwasan.mk \
-    $(LOCAL_DIR)/factory_lynx.mk \
    $(LOCAL_DIR)/lineage_lynx.mk
-
-COMMON_LUNCH_CHOICES := \
-    aosp_lynx-trunk_staging-userdebug
--- a/BoardConfigEvolution.mk
+++ b/BoardConfigEvolution.mk
@@ -0,0 +1,4 @@
+#
+# SPDX-FileCopyrightText: 2024 The Evolution X Project
+# SPDX-License-Identifier: Apache-2.0
+#
--- a/4
+++ b/4
@@ -1,4 +0,0 @@
-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
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -1,2 +0,0 @@
-[Builtin Hooks]
-jsonlint = true
--- a/aosp_lynx.mk
+++ b/aosp_lynx.mk
@@ -28,6 +28,3 @@ PRODUCT_DEVICE := lynx
 PRODUCT_MODEL := AOSP on Lynx
 PRODUCT_BRAND := Android
 PRODUCT_MANUFACTURER := Google
-
-DEVICE_MANIFEST_FILE := \
-	device/google/lynx/manifest.xml
--- a/aosp_lynx_hwasan.mk
+++ b/aosp_lynx_hwasan.mk
@@ -1,23 +0,0 @@
-#
-# Copyright 2023 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/lynx/aosp_lynx.mk)
-PRODUCT_NAME := aosp_lynx_hwasan
-
-# Add "hwaddress" as a global sanitizer if it's missing.
-ifeq ($(filter hwaddress,$(SANITIZE_TARGET)),)
-  SANITIZE_TARGET := $(strip $(SANITIZE_TARGET) hwaddress)
-endif
--- a/audio/lynx/audio-tables.mk
+++ b/audio/lynx/audio-tables.mk
@@ -62,21 +62,3 @@ PRODUCT_COPY_FILES += \
    device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/mcps.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/mcps.dat \
    device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_config.ini:$(TARGET_COPY_OUT_VENDOR)/etc/waves_config.ini \
    device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/waves_preset.mps
-
-# eng specific
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_COPY_FILES += \
-    device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/BLUETOOTH.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/BLUETOOTH.mods \
-    device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSFREE.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSFREE.mods \
-    device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSET.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSET.mods \
-    device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HEADSET.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HEADSET.mods
-
-#Bluenote files
-PRODUCT_COPY_FILES += \
-    device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/tuning/bluenote/template.xml:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/template.xml \
-    device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/tuning/bluenote/tuning_constraints_combination.xml:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/tuning_constraints_combination.xml
-
-# Mixer Path Configuration for Audio Speaker Calibration Tool crus_sp_cal
-PRODUCT_COPY_FILES += \
-    device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/cs35l41/crus_sp_cal_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/crus_sp_cal_mixer_paths.xml
-endif
--- a/audio/lynx/config/mixer_paths_factory.xml
+++ b/audio/lynx/config/mixer_paths_factory.xml
@@ -1,389 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<mixer>
-    <ctl name="TDM_0_RX Mixer EP3" value="0" />
-    <ctl name="TDM_0_RX Mixer EP6" value="0" />
-    <ctl name="I2S_0_RX Mixer EP3" value="0" />
-    <ctl name="Main AMP Enable Switch" value="0" />
-    <ctl name="R Main AMP Enable Switch" value="0" />
-    <ctl name="MIC HW Gain At Lower Power Mode (cB)" value="-160" />
-    <ctl name="MIC HW Gain At High Power Mode (cB)" value="0" />
-    <ctl name="MIC Record Soft Gain (dB)" value="0"/>
-
-    <ctl name="EP1 TX Mixer TDM_0_TX" value="0" />
-    <ctl name="DEFAULT_MIC_ID" value="0" />
-    <ctl name="MIC0" value="0" />
-    <ctl name="MIC1" value="0" />
-    <ctl name="MIC2" value="0" />
-    <ctl name="MIC3" value="0" />
-    <ctl name="AoC Speaker Mixer ASP Mode" value="ASP_ON" />
-
-    <ctl name="TDM_0_RX Mixer US" value="0" />
-    <ctl name="US Record Enable" value="0" />
-
-    <path name="mfg-playback">
-    </path>
-
-    <path name="deep-buffer-playback speaker">
-        <ctl name="AoC Speaker Mixer ASP Mode" value="ASP_BYPASS" />
-        <ctl name="TDM_0_RX Mixer EP6" value="1" />
-        <path name="mfg-playback" />
-    </path>
-
-    <path name="deep-buffer-playback headphones">
-        <ctl name="I2S_0_RX Mixer EP6" value="1" />
-        <path name="mfg-playback" />
-    </path>
-
-    <path name="mfg-record">
-        <ctl name="EP1 TX Mixer TDM_0_TX" value="1" />
-    </path>
-
-    <path name="us-mfg-record">
-        <ctl name="US Record Enable" value="1" />
-        <ctl name="EP1 TX Mixer TDM_0_TX" value="1" />
-    </path>
-
-    <path name="mic1-status">
-        <ctl name="MIC0" value="1" />
-    </path>
-
-    <path name="mic2-status">
-        <ctl name="MIC1" value="1" />
-    </path>
-
-    <path name="mic3-status">
-        <ctl name="MIC2" value="1" />
-    </path>
-
-    <path name="mic4-status">
-        <ctl name="MIC3" value="0" />
-    </path>
-
-    <path name="mic1-gain">
-        <ctl name="MIC HW Gain At Lower Power Mode (cB)" />
-        <ctl name="MIC HW Gain At High Power Mode (cB)" />
-    </path>
-
-    <path name="mic2-gain">
-        <ctl name="MIC HW Gain At Lower Power Mode (cB)" />
-        <ctl name="MIC HW Gain At High Power Mode (cB)" />
-    </path>
-
-    <path name="mic3-gain">
-        <ctl name="MIC HW Gain At Lower Power Mode (cB)" />
-        <ctl name="MIC HW Gain At High Power Mode (cB)" />
-    </path>
-
-    <path name="mic4-gain">
-        <ctl name="MIC HW Gain At Lower Power Mode (cB)" />
-        <ctl name="MIC HW Gain At High Power Mode (cB)" />
-    </path>
-
-    <path name="mic1-sw-gain">
-        <ctl name="MIC Record Soft Gain (dB)" />
-    </path>
-
-    <path name="mic2-sw-gain">
-        <ctl name="MIC Record Soft Gain (dB)" />
-    </path>
-
-    <path name="mic3-sw-gain">
-        <ctl name="MIC Record Soft Gain (dB)" />
-    </path>
-
-    <path name="mic4-sw-gain">
-        <ctl name="MIC Record Soft Gain (dB)" />
-    </path>
-
-    <path name="usb-capture-gain">
-        <ctl name="Headset Capture Volume" />
-    </path>
-
-    <path name="mic1-only">
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="-1" />
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1" />
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
-        <ctl name="MIC0" value="1" />
-        <ctl name="MIC Record Soft Gain (dB)" value="0" />
-    </path>
-
-    <path name="mic2-only">
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="2" />
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="-1" />
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1" />
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
-        <ctl name="MIC1" value="1" />
-        <ctl name="MIC Record Soft Gain (dB)" value="0" />
-    </path>
-
-    <path name="mic3-only">
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="2" />
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="-1" />
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1" />
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
-        <ctl name="MIC2" value="1" />
-        <ctl name="MIC Record Soft Gain (dB)" value="0" />
-    </path>
-
-    <path name="mic4-only">
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="3" />
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="-1" />
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1" />
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
-        <ctl name="MIC3" value="0" />
-        <ctl name="MIC Record Soft Gain (dB)" value="0" />
-    </path>
-
-    <path name="mic-all">
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="2" />
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="3" />
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
-        <ctl name="MIC0" value="1" />
-        <ctl name="MIC1" value="1" />
-        <ctl name="MIC2" value="1" />
-        <ctl name="MIC3" value="0" />
-        <ctl name="MIC Record Soft Gain (dB)" value="0" />
-    </path>
-
-    <path name="amp_iv-only">
-        <ctl name="R ASPTX1 Slot Position" value="2" />
-        <ctl name="R ASPTX2 Slot Position" value="3" />
-        <ctl name="R ASPTX3 Slot Position" value="6" />
-        <ctl name="R ASPTX4 Slot Position" value="7" />
-        <ctl name="ASPTX1 Slot Position" value="0" />
-        <ctl name="ASPTX2 Slot Position" value="1" />
-        <ctl name="ASPTX3 Slot Position" value="4" />
-        <ctl name="ASPTX4 Slot Position" value="5" />
-        <ctl name="R ASP TX1 Source" value="VMON" />
-        <ctl name="R ASP TX2 Source" value="ASPRX1" />
-        <ctl name="R ASP TX3 Source" value="Zero" />
-        <ctl name="R ASP TX4 Source" value="Zero" />
-        <ctl name="ASP TX1 Source" value="VMON" />
-        <ctl name="ASP TX2 Source" value="ASPRX1" />
-        <ctl name="ASP TX3 Source" value="Zero" />
-        <ctl name="ASP TX4 Source" value="Zero" />
-        <ctl name="NoHost1 TX Mixer TDM_0_TX" value="1" />
-    </path>
-
-    <path name="amp_iv1-only">
-        <ctl name="R ASPTX1 Slot Position" value="4" />
-        <ctl name="R ASPTX2 Slot Position" value="5" />
-        <ctl name="R ASPTX3 Slot Position" value="6" />
-        <ctl name="R ASPTX4 Slot Position" value="7" />
-        <ctl name="ASPTX1 Slot Position" value="0" />
-        <ctl name="ASPTX2 Slot Position" value="1" />
-        <ctl name="ASPTX3 Slot Position" value="2" />
-        <ctl name="ASPTX4 Slot Position" value="3" />
-        <ctl name="R ASP TX1 Source" value="Zero" />
-        <ctl name="R ASP TX2 Source" value="Zero" />
-        <ctl name="R ASP TX3 Source" value="Zero" />
-        <ctl name="R ASP TX4 Source" value="Zero" />
-        <ctl name="ASP TX1 Source" value="VMON" />
-        <ctl name="ASP TX2 Source" value="IMON" />
-        <ctl name="ASP TX3 Source" value="VPMON" />
-        <ctl name="ASP TX4 Source" value="ASPRX1" />
-        <ctl name="NoHost1 TX Mixer TDM_0_TX" value="1" />
-    </path>
-
-    <path name="amp_iv2-only">
-        <ctl name="R ASPTX1 Slot Position" value="0" />
-        <ctl name="R ASPTX2 Slot Position" value="1" />
-        <ctl name="R ASPTX3 Slot Position" value="2" />
-        <ctl name="R ASPTX4 Slot Position" value="3" />
-        <ctl name="ASPTX1 Slot Position" value="4" />
-        <ctl name="ASPTX2 Slot Position" value="5" />
-        <ctl name="ASPTX3 Slot Position" value="6" />
-        <ctl name="ASPTX4 Slot Position" value="7" />
-        <ctl name="R ASP TX1 Source" value="VMON" />
-        <ctl name="R ASP TX2 Source" value="IMON" />
-        <ctl name="R ASP TX3 Source" value="VPMON" />
-        <ctl name="R ASP TX4 Source" value="ASPRX1" />
-        <ctl name="ASP TX1 Source" value="Zero" />
-        <ctl name="ASP TX2 Source" value="Zero" />
-        <ctl name="ASP TX3 Source" value="Zero" />
-        <ctl name="ASP TX4 Source" value="Zero" />
-        <ctl name="NoHost1 TX Mixer TDM_0_TX" value="1" />
-    </path>
-
-    <path name="us-amp_iv-only">
-        <ctl name="TDM_0_RX Sample Rate" value="SR_96K" />
-        <ctl name="TDM_0_TX Sample Rate" value="SR_96K" />
-        <path name="amp_iv-only" />
-    </path>
-
-    <path name="us-amp_iv1-only">
-        <ctl name="TDM_0_RX Sample Rate" value="SR_96K" />
-        <ctl name="TDM_0_TX Sample Rate" value="SR_96K" />
-        <path name="amp_iv1-only" />
-    </path>
-
-    <path name="us-amp_iv2-only">
-        <ctl name="TDM_0_RX Sample Rate" value="SR_96K" />
-        <ctl name="TDM_0_TX Sample Rate" value="SR_96K" />
-        <path name="amp_iv2-only" />
-    </path>
-
-    <path name="speaker1-status">
-        <ctl name="Main AMP Enable Switch" value="1" />
-    </path>
-
-    <path name="speaker2-status">
-        <ctl name="R Main AMP Enable Switch" value="1" />
-    </path>
-
-    <path name="speaker1-gain">
-        <ctl name="AMP PCM Gain" />
-    </path>
-
-    <path name="speaker2-gain">
-        <ctl name="R AMP PCM Gain" />
-    </path>
-
-    <path name="usb-playback-gain">
-        <ctl name="Headset Playback Volume" />
-    </path>
-
-    <path name="mfg-playback speaker">
-        <ctl name="AoC Speaker Mixer ASP Mode" value="ASP_BYPASS" />
-        <ctl name="TDM_0_RX Mixer EP3" value="1" />
-        <ctl name="ASPRX1 Slot Position" value="0" />
-        <ctl name="R ASPRX1 Slot Position" value="1" />
-        <ctl name="SINK_IDS" id="0" value="0" />
-        <ctl name="SINK_IDS" id="1" value="-1" />
-    </path>
-
-    <path name="mfg-playback headphones">
-        <ctl name="I2S_0_RX Chan" value="Two" />
-        <ctl name="I2S_0_RX Format" value="S32_LE" />
-        <ctl name="I2S_0_RX Mixer EP3" value="1" />
-        <ctl name="SINK_IDS" id="0" value="1" />
-        <ctl name="SINK_IDS" id="1" value="-1" />
-    </path>
-
-    <path name="mfg-playback usb-headphones">
-        <ctl name="USB Dev ID v2" value="2" />
-        <ctl name="USB Playback EP ID v2" value="1" />
-        <ctl name="USB Capture EP ID v2" value="0" />
-        <ctl name="USB Playback FORMAT v2" value="6" />
-        <ctl name="USB Playback SR v2" value="48000" />
-        <ctl name="USB Playback CH v2" value="2" />
-        <ctl name="USB Playback BW v2" value="16" />
-        <ctl name="USB Config To AoC v2" value="1" />
-        <ctl name="USB_RX Mixer EP3" value="1" />
-    </path>
-
-    <path name="mfg-record usb-headset-mic">
-        <ctl name="Audio Capture Mic Source" value="USB_MIC"/>
-        <ctl name="USB Playback EP ID v2" value="0" />
-        <ctl name="USB Capture FORMAT v2" value="1" />
-        <ctl name="USB Config To AoC v2" value="1"/>
-        <ctl name="EP1 TX Mixer USB_TX" value="1"/>
-    </path>
-
-    <path name="us-mfg-playback speaker">
-        <ctl name="TDM_0_RX Sample Rate" value="SR_96K" />
-        <ctl name="TDM_0_TX Sample Rate" value="SR_96K" />
-        <ctl name="TDM_0_RX Mixer US" value="1" />
-    </path>
-
-    <path name="speaker1-only">
-        <ctl name="Main AMP Enable Switch" value="1" />
-        <path name="mfg-playback speaker" />
-        <ctl name="AMP PCM Gain" value="17" />
-        <ctl name="PCM Source" value="ASP" />
-    </path>
-
-    <path name="speaker2-only">
-        <ctl name="R Main AMP Enable Switch" value="1" />
-        <path name="mfg-playback speaker" />
-        <ctl name="R AMP PCM Gain" value="17" />
-        <ctl name="R PCM Source" value="ASP" />
-    </path>
-
-    <path name="us-speaker1-only">
-        <path name="us-mfg-playback speaker" />
-        <ctl name="PCM Source" value="ASP" />
-        <ctl name="Main AMP Enable Switch" value="1" />
-    </path>
-
-    <path name="us-speaker2-only">
-        <path name="us-mfg-playback speaker" />
-        <ctl name="R PCM Source" value="ASP" />
-        <ctl name="R Main AMP Enable Switch" value="1" />
-    </path>
-
-    <path name="headphones">
-        <ctl name="DAC1 MIXL DAC1 Switch" value="1" />
-        <ctl name="DAC1 MIXR DAC1 Switch" value="1" />
-        <ctl name="Stereo1 DAC MIXL DAC L1 Switch" value="1" />
-        <ctl name="Stereo1 DAC MIXR DAC R1 Switch" value="1" />
-        <ctl name="DAC L1 Source" value="Stereo1 DAC Mixer" />
-        <ctl name="DAC R1 Source" value="Stereo1 DAC Mixer" />
-        <ctl name="HPOL Playback Switch" value="1" />
-        <ctl name="HPOR Playback Switch" value="1" />
-        <path name="mfg-playback headphones" />
-    </path>
-
-    <path name="speaker-all">
-        <ctl name="Main AMP Enable Switch" value="1" />
-        <ctl name="PCM Source" value="ASP" />
-        <ctl name="R Main AMP Enable Switch" value="1" />
-        <ctl name="R PCM Source" value="ASP" />
-        <path name="mfg-playback speaker" />
-    </path>
-
-    <path name="us-speaker-all">
-        <path name="us-mfg-playback speaker" />
-        <ctl name="PCM Source" value="ASP" />
-        <ctl name="Main AMP Enable Switch" value="1" />
-        <ctl name="R PCM Source" value="ASP" />
-        <ctl name="R Main AMP Enable Switch" value="1" />
-    </path>
-
-    <path name="loopback-mic-speaker">
-        <ctl name="EP1 TX Mixer TDM_0_TX" value="1" />
-        <ctl name="SINK_IDS" id="0" value="0" />
-        <ctl name="SINK_IDS" id="1" value="-1" />
-        <path name="mfg-playback" />
-    </path>
-
-    <path name="loopback-mic-headphones">
-        <ctl name="EP1 TX Mixer TDM_0_TX" value="1" />
-        <ctl name="SINK_IDS" id="0" value="1" />
-        <ctl name="SINK_IDS" id="1" value="-1" />
-        <path name="mfg-playback" />
-    </path>
-
-    <path name="loopback-mic-usb-headphones">
-        <ctl name="MIC HW Gain At Lower Power Mode (cB)" value="-160" />
-        <ctl name="MIC HW Gain At High Power Mode (cB)" value="0" />
-        <ctl name="TDM_0_TX Format" value="S32_LE" />
-        <ctl name="TDM_0_TX Chan" value="One" />
-        <ctl name="EP1 TX Mixer TDM_0_TX" value="1" />
-    </path>
-
-    <path name="loopback-usb-mic-speaker">
-        <ctl name="USB Capture FORMAT v2" value="1" />
-        <ctl name="MIC Record Soft Gain (dB)" value="0" />
-    </path>
-
-    <path name="loopback-usb-mic-usb-headphone">
-        <ctl name="Audio Capture Mic Source" value='USB_MIC' />
-        <ctl name="USB Capture FORMAT v2" value="1" />
-        <ctl name="MIC Record Soft Gain (dB)" value="0" />
-    </path>
-
-    <pcm_id name="loopback-mic1" value="EP1 capture (*)"/>
-    <pcm_id name="loopback-mic2" value="EP1 capture (*)"/>
-    <pcm_id name="loopback-mic3" value="EP1 capture (*)"/>
-    <pcm_id name="loopback-mic4" value="EP1 capture (*)"/>
-    <pcm_id name="loopback-speaker1" value="EP3 playback (*)"/>
-    <pcm_id name="loopback-speaker2" value="EP3 playback (*)"/>
-    <pcm_id name="loopback-speaker3" value="EP3 playback (*)"/>
-    <pcm_id name="loopback-headphones" value="EP3 playback (*)"/>
-    <pcm_id name="loopback-usb-headphones" value="EP3 playback (*)"/>
-    <pcm_id name="loopback-usb-mic" value="EP1 capture (*)"/>
-    <pcm_id name="loopback-amp_iv" value="nohost1 capture (*)"/>
-</mixer>
--- a/audio/lynx/cs35l41/crus_sp_cal_mixer_paths.xml
+++ b/audio/lynx/cs35l41/crus_sp_cal_mixer_paths.xml
@@ -1,307 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.    -->
-<!--                                                                        -->
-<!-- Redistribution and use in source and binary forms, with or without     -->
-<!-- modification, are permitted provided that the following conditions are -->
-<!-- met:                                                                   -->
-<!--     * Redistributions of source code must retain the above copyright   -->
-<!--       notice, this list of conditions and the following disclaimer.    -->
-<!--     * Redistributions in binary form must reproduce the above          -->
-<!--       copyright notice, this list of conditions and the following      -->
-<!--       disclaimer in the documentation and/or other materials provided  -->
-<!--       with the distribution.                                           -->
-<!--     * Neither the name of The Linux Foundation nor the names of its    -->
-<!--       contributors may be used to endorse or promote products derived  -->
-<!--       from this software without specific prior written permission.    -->
-<!--                                                                        -->
-<!-- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED           -->
-<!-- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF   -->
-<!-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -->
-<!-- ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -->
-<!-- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -->
-<!-- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF   -->
-<!-- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR        -->
-<!-- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  -->
-<!-- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -->
-<!-- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                          -->
-<mixer>
-    <!-- Initial Values -->
-    <!-- Preload Stage -->
-    <ctl name="Main AMP Enable Switch" value="0" />
-    <ctl name="DSP1 Preload Switch" value="0" />
-    <ctl name="R Main AMP Enable Switch" value="0" />
-    <ctl name="R DSP1 Preload Switch" value="0" />
-    <!-- Clock-trigger Stage -->
-    <ctl name="SINK_IDS" id="0" value="-1"/>
-    <ctl name="SINK_IDS" id="1" value="-1"/>
-    <ctl name="PCM Playback Volume" value="10"/>
-    <ctl name="TDM_0_RX Mixer EP6" value="0"/>
-
-    <!-- Preparation Stage -->
-    <path name="crus-switch-fw-prepare">
-        <ctl name="DRE DRE Switch" value="1" />
-        <ctl name="VBSTMON Output Switch" value="1" />
-        <ctl name="DSP Booted" value="0" />
-        <ctl name="DSP1 Preload Switch" value="0" />
-        <ctl name="R DRE DRE Switch" value="1" />
-        <ctl name="R VBSTMON Output Switch" value="1" />
-        <ctl name="R DSP Booted" value="0" />
-        <ctl name="R DSP1 Preload Switch" value="0" />
-    </path>
-
-    <!-- Preload Stage -->
-    <path name="crus-fw-preload">
-        <ctl name="DSP1 Preload Switch" value="1" />
-        <ctl name="R DSP1 Preload Switch" value="1" />
-    </path>
-
-    <!-- Firmware-switching Stage -->
-    <path name="crus-switch-fw-Calibration">
-        <ctl name="AMP PCM Gain" value="17" />
-        <ctl name="Digital PCM Volume" value="817" />
-        <ctl name="PCM Source" value="DSP" />
-        <ctl name="DSP1 Firmware" value="Calibration" />
-        <ctl name="R AMP PCM Gain" value="17" />
-        <ctl name="R Digital PCM Volume" value="817" />
-        <ctl name="R PCM Source" value="DSP" />
-        <ctl name="R DSP1 Firmware" value="Calibration" />
-    </path>
-
-    <path name="crus-switch-fw-Diagnostic">
-        <ctl name="AMP PCM Gain" value="17" />
-        <ctl name="Digital PCM Volume" value="817" />
-        <ctl name="PCM Source" value="DSP" />
-        <ctl name="DSP1 Firmware" value="Diagnostic" />
-        <ctl name="R AMP PCM Gain" value="17" />
-        <ctl name="R Digital PCM Volume" value="817" />
-        <ctl name="R PCM Source" value="DSP" />
-        <ctl name="R DSP1 Firmware" value="Diagnostic" />
-    </path>
-
-    <path name="crus-switch-fw-Protection">
-        <ctl name="PCM Source" value="DSP" />
-        <ctl name="DSP1 Firmware" value="Protection" />
-        <ctl name="R PCM Source" value="DSP" />
-        <ctl name="R DSP1 Firmware" value="Protection" />
-    </path>
-
-    <!-- DSP-initialization Stage -->
-    <path name="crus-dsp-pre-calibration-amp1">
-        <ctl name="Main AMP Enable Switch" value="1" />
-    </path>
-
-    <path name="crus-dsp-pre-calibration-amp2">
-        <ctl name="R Main AMP Enable Switch" value="1" />
-    </path>
-
-    <path name="crus-dsp-pre-calibration">
-        <path name="crus-dsp-pre-calibration-amp1" />
-        <path name="crus-dsp-pre-calibration-amp2" />
-    </path>
-
-    <path name="crus-dsp-pre-diagnostic-amp1">
-        <ctl name="Main AMP Enable Switch" value="1" />
-    </path>
-
-    <path name="crus-dsp-pre-diagnostic-amp2">
-        <ctl name="R Main AMP Enable Switch" value="1" />
-    </path>
-
-    <path name="crus-dsp-pre-diagnostic">
-        <path name="crus-dsp-pre-diagnostic-amp1" />
-        <path name="crus-dsp-pre-diagnostic-amp2" />
-    </path>
-
-    <path name="crus-dsp-pre-protection">
-        <ctl name="Main AMP Enable Switch" value="1" />
-        <ctl name="R Main AMP Enable Switch" value="1" />
-    </path>
-
-    <!-- Clock-trigger Stage -->
-    <path name="platform-controls">
-        <ctl name="PCM Playback Volume" value="1000"/>
-        <ctl name="SINK_IDS" id="0" value="0"/>
-        <ctl name="SINK_IDS" id="1" value="-1"/>
-        <ctl name="TDM_0_RX Mixer EP6" value="1"/>
-    </path>
-
-    <!-- Post loaded firmware -->
-    <path name="crus-dsp-post-loading-fw">
-        <ctl name="Main AMP Enable Switch" value="0" />
-        <ctl name="R Main AMP Enable Switch" value="0" />
-    </path>
-
-    <!-- Value & Information Fetch Stage -->
-    <path name="platform-values">
-        <ctl name="TDM_0_RX Format" />
-        <ctl name="TDM_0_RX Chan" />
-        <ctl name="TDM_0_RX Sample Rate" />
-        <ctl name="PCM Playback Volume" />
-        <ctl name="TDM_0_RX Mixer EP6" />
-    </path>
-
-    <path name="cs35l41-values">
-        <ctl name="DRE DRE Switch" />
-        <ctl name="R DRE DRE Switch" />
-        <ctl name="VBSTMON Output Switch" />
-        <ctl name="R VBSTMON Output Switch" />
-        <ctl name="AMP PCM Gain" />
-        <ctl name="R AMP PCM Gain" />
-        <ctl name="Digital PCM Volume" />
-        <ctl name="R Digital PCM Volume" />
-        <ctl name="PCM Source" />
-        <ctl name="R PCM Source" />
-        <ctl name="DSP Booted" />
-        <ctl name="R DSP Booted" />
-        <ctl name="Main AMP Enable Switch" />
-        <ctl name="R Main AMP Enable Switch" />
-        <ctl name="DSP1 Preload Switch" />
-        <ctl name="R DSP1 Preload Switch" />
-        <ctl name="DSP1 Firmware" />
-        <ctl name="R DSP1 Firmware" />
-    </path>
-
-
-    <!-- Note that the order of controls does matter because
-         it should be matched to the structure defined in
-         sp_cal_common.h -->
-    <!--
-        struct calibration_data {
-            unsigned int cal_r;
-            unsigned int cal_status;
-            unsigned int cal_checksum;
-            unsigned int cal_ambient;
-            unsigned int amp_pcm_gain;
-            unsigned int digital_pcm_gain;
-        };
-    -->
-    <path name="cs35l41-dsp-amp1-calibration-values">
-        <ctl name="DSP1 Calibration cd CAL_R" />
-        <ctl name="DSP1 Calibration cd CAL_STATUS" />
-        <ctl name="DSP1 Calibration cd CAL_CHECKSUM" />
-        <ctl name="DSP1 Calibration cd CAL_AMBIENT" />
-        <ctl name="AMP PCM Gain" />
-        <ctl name="Digital PCM Volume" />
-
-        <!-- Only for debug print -->
-        <ctl name="DSP1 Calibration cd CAL_SET_STATUS" />
-    </path>
-
-    <path name="cs35l41-dsp-amp2-calibration-values">
-        <ctl name="R DSP1 Calibration cd CAL_R" />
-        <ctl name="R DSP1 Calibration cd CAL_STATUS" />
-        <ctl name="R DSP1 Calibration cd CAL_CHECKSUM" />
-        <ctl name="R DSP1 Calibration cd CAL_AMBIENT" />
-        <ctl name="R AMP PCM Gain" />
-        <ctl name="R Digital PCM Volume" />
-
-        <!-- Only for debug print -->
-        <ctl name="R DSP1 Calibration cd CAL_SET_STATUS" />
-    </path>
-
-    <!--
-        struct diagnostic_data {
-            struct calibration_data calibration_data;
-            unsigned int z_low_diff;
-            unsigned int diag_f0;
-            unsigned int diag_f0_status;
-        };
-    -->
-    <path name="cs35l41-dsp-amp1-diagnostic-values">
-        <!-- struct calibration_data START -->
-        <ctl name="DSP1 Diagnostic cd CAL_R" />
-        <ctl name="DSP1 Diagnostic cd CAL_STATUS" />
-        <ctl name="DSP1 Diagnostic cd CAL_CHECKSUM" />
-        <ctl name="DSP1 Diagnostic cd CAL_AMBIENT" />
-        <ctl name="AMP PCM Gain" />
-        <ctl name="Digital PCM Volume" />
-        <!-- struct calibration_data END -->
-        <ctl name="DSP1 Diagnostic cd DIAG_Z_LOW_DIFF" />
-        <ctl name="DSP1 Diagnostic cd DIAG_F0" />
-        <ctl name="DSP1 Diagnostic cd DIAG_F0_STATUS" />
-
-        <!-- Only for debug print -->
-        <ctl name="DSP1 Diagnostic cd CAL_SET_STATUS" />
-    </path>
-
-    <path name="cs35l41-dsp-amp2-diagnostic-values">
-        <!-- struct calibration_data START -->
-        <ctl name="R DSP1 Diagnostic cd CAL_R" />
-        <ctl name="R DSP1 Diagnostic cd CAL_STATUS" />
-        <ctl name="R DSP1 Diagnostic cd CAL_CHECKSUM" />
-        <ctl name="R DSP1 Diagnostic cd CAL_AMBIENT" />
-        <ctl name="R AMP PCM Gain" />
-        <ctl name="R Digital PCM Volume" />
-        <!-- struct calibration_data END -->
-        <ctl name="R DSP1 Diagnostic cd DIAG_Z_LOW_DIFF" />
-        <ctl name="R DSP1 Diagnostic cd DIAG_F0" />
-        <ctl name="R DSP1 Diagnostic cd DIAG_F0_STATUS" />
-
-        <!-- Only for debug print -->
-        <ctl name="R DSP1 Diagnostic cd CAL_SET_STATUS" />
-    </path>
-
-    <path name="cs35l41-dsp-amp1-protection-values">
-        <!-- struct calibration_data START -->
-        <ctl name="DSP1 Protection cd CAL_R" />
-        <ctl name="DSP1 Protection cd CAL_STATUS" />
-        <ctl name="DSP1 Protection cd CAL_CHECKSUM" />
-        <ctl name="DSP1 Protection cd CAL_AMBIENT" />
-
-        <!-- These controls are unrelated so we can simply
-             skip them
-        <ctl name="AMP PCM Gain" />
-        <ctl name="Digital PCM Volume" />
-        -->
-        <!-- struct calibration_data END -->
-    </path>
-
-    <path name="cs35l41-dsp-amp2-protection-values">
-        <!-- struct calibration_data START -->
-        <ctl name="R DSP1 Protection cd CAL_R" />
-        <ctl name="R DSP1 Protection cd CAL_STATUS" />
-        <ctl name="R DSP1 Protection cd CAL_CHECKSUM" />
-        <ctl name="R DSP1 Protection cd CAL_AMBIENT" />
-
-        <!-- These controls are unrelated so we can simply
-             skip them
-        <ctl name="R AMP PCM Gain" />
-        <ctl name="R Digital PCM Volume" />
-        -->
-        <!-- struct calibration_data END -->
-    </path>
-
-    <path name="cs35l41-dsp-amp1-calibration-completion">
-        <ctl name="DSP1 Calibration cd CAL_STATUS" />
-    </path>
-
-    <path name="cs35l41-dsp-amp2-calibration-completion">
-        <ctl name="R DSP1 Calibration cd CAL_STATUS" />
-    </path>
-
-    <path name="cs35l41-dsp-amp1-protection-completion">
-        <ctl name="DSP1 Protection cd CAL_SET_STATUS" />
-    </path>
-
-    <path name="cs35l41-dsp-amp2-protection-completion">
-        <ctl name="R DSP1 Protection cd CAL_SET_STATUS" />
-    </path>
-
-    <path name="cs35l41-dsp-amp1-diagnostic-completion">
-        <ctl name="DSP1 Diagnostic cd CAL_STATUS" />
-        <ctl name="DSP1 Diagnostic cd DIAG_F0_STATUS" />
-    </path>
-
-    <path name="cs35l41-dsp-amp2-diagnostic-completion">
-        <ctl name="R DSP1 Diagnostic cd CAL_STATUS" />
-        <ctl name="R DSP1 Diagnostic cd DIAG_F0_STATUS" />
-    </path>
-
-    <path name="cs35l41-dsp-amp1-enable-status">
-        <ctl name="Main AMP Enable Switch" />
-    </path>
-
-    <path name="cs35l41-dsp-amp2-enable-status">
-        <ctl name="R Main AMP Enable Switch" />
-    </path>
-</mixer>
--- a/audio/lynx/factory-audio-tables.mk
+++ b/audio/lynx/factory-audio-tables.mk
@@ -1,22 +0,0 @@
-#
-# 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.
-#
-
-AUDIO_FACTORY_TABLE_FOLDER := lynx
-
-# Mixer Path Configuration for Audio Factory
-PRODUCT_COPY_FILES += \
-    device/google/lynx/audio/$(AUDIO_FACTORY_TABLE_FOLDER)/config/mixer_paths_factory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_factory.xml
-
--- a/audio/lynx/tuning/bluenote/template.xml
+++ b/audio/lynx/tuning/bluenote/template.xml
@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<template>
-  <modules>
-    <module id="2" name="Waves">
-      <param id="0" max="3" name="opMode_" type="uint32"/>
-    </module>
-    <module id="3" name="Forte">
-      <param id="0" max="3" name="opMode_" type="uint32"/>
-    </module>
-    <module id="5" name="Auto Gain Control">
-      <param default="0" id="0" max="3" name="opMode_" type="uint32"/>
-      <param default="48000" id="1" name="fs_" type="uint32"/>
-      <param default="1" id="2" name="numCh_" type="uint32"/>
-      <param default="1" id="3" name="chMask_" type="uint32"/>
-      <param id="16" name="GainApplied" type="float"/>
-      <param id="17" name="idealRMS" type="float"/>
-      <param id="18" name="noiseGate" type="float"/>
-      <param id="19" name="minGain" type="float"/>
-      <param id="20" name="maxGain" type="float"/>
-      <param id="21" name="longGainAtRt" type="uint32"/>
-      <param id="22" name="GainAtRt" type="uint32"/>
-      <param id="23" name="rmsTav" type="uint32"/>
-    </module>
-    <module id="6" name="Surround Record">
-      <param default="0" id="0" max="3" name="opMode_" type="uint32"/>
-      <param default="48000" id="1" name="fs_" type="uint32"/>
-      <param default="3" id="2" name="numCh_" type="uint32"/>
-      <param default="7" id="3" name="chMask_" type="uint32"/>
-      <param id="16" max="1" min="0" name="alpha" type="float"/>
-      <param complex="true" id="17" name="ch0_profileL" size="1024" type="float"/>
-      <param complex="true" id="18" name="ch1_profileL" size="1024" type="float"/>
-      <param complex="true" id="19" name="ch2_profileL" size="1024" type="float"/>
-      <param complex="true" id="20" name="ch0_profileR" size="1024" type="float"/>
-      <param complex="true" id="21" name="ch1_profileR" size="1024" type="float"/>
-      <param complex="true" id="22" name="ch2_profileR" size="1024" type="float"/>
-      <param complex="true" id="23" name="ch0_profileAZ" size="1024" type="float"/>
-      <param complex="true" id="24" name="ch1_profileAZ" size="1024" type="float"/>
-      <param complex="true" id="25" name="ch2_profileAZ" size="1024" type="float"/>
-      <struct id="26">
-        <param default="1" name="ch_gain" type="float"/>
-        <param default="1" name="zoom_gain" type="float"/>
-      </struct>
-      <param default="0" id="27" name="ch0_assignFrom" type="int32"/>
-      <param default="1" id="28" name="ch1_assignFrom" type="int32"/>
-      <param default="2" id="29" name="ch2_assignFrom" type="int32"/>
-    </module>
-    <module id="7" name="Multi Channel IIR 2">
-      <param default="0" id="0" max="3" name="opMode_" type="uint32"/>
-      <param default="48000" id="1" name="fs_" type="uint32"/>
-      <param default="3" id="2" name="numCh_" type="uint32"/>
-      <param default="1" id="3" name="chMask_" type="uint32"/>
-      <param default="3" id="16" max="3" min="1" name="numOfChannel" type="uint32"/>
-      <param id="17" name="coeff" size="300" type="float"/>
-      <struct id="18">
-        <param max="18" min="-96" name="gain" size="60" type="float"/>
-        <param max="24000" min="0" name="frequency" size="60" type="uint32"/>
-        <param max="200" min="0" name="qfactor" size="60" type="float"/>
-        <param default="4" name="type" size="60" type="int32"/>
-      </struct>
-    </module>
-    <module id="8" name="Multi Band DRC">
-      <param default="0" id="0" max="3" name="opMode_" type="uint32"/>
-      <param default="48000" id="1" name="fs_" type="uint32"/>
-      <param default="2" id="2" name="numCh_" type="uint32"/>
-      <param default="3" id="3" name="chMask_" type="uint32"/>
-      <struct id="16">
-        <param default="1" max="3" min="1" name="numBand" type="uint32"/>
-        <param name="IIR_LowPass1" size="5" type="float"/>
-        <param name="IIR_HighPass1" size="5" type="float"/>
-        <param name="IIR_LowPass2" size="5" type="float"/>
-        <param name="IIR_HighPass2" size="5" type="float"/>
-      </struct>
-      <struct id="17">
-        <param max="20" min="0" name="band0_delay_ms" type="float"/>
-        <param default="5" max="20" min="0" minInclusive="false" name="band0_rms_ms" type="float"/>
-        <param max="30" min="0" name="band0_gain_dB" type="float"/>
-        <param max="30" min="-30" name="band0_Min_Gain_dB" type="float"/>
-        <param default="1" max="3" min="1" name="band0_numOfKnee" type="uint32"/>
-        <param name="band0_threadhold_dB" size="3" type="float"/>
-        <param name="band0_compressRatio" size="4" type="float"/>
-        <param name="band0_kneeWidth" size="3" type="float"/>
-        <param name="band0_attackTime_ms" size="4" type="float"/>
-        <param name="band0_releaseTime_ms" size="4" type="float"/>
-        <param name="band0_hysteresis" size="4" type="float"/>
-        <param max="20" min="0" name="band1_delay_ms" type="float"/>
-        <param default="5" max="20" min="0" minInclusive="false" name="band1_rms_ms" type="float"/>
-        <param max="30" min="0" name="band1_gain_dB" type="float"/>
-        <param max="30" min="-30" name="band1_Min_Gain_dB" type="float"/>
-        <param default="1" max="3" min="1" name="band1_numOfKnee" type="uint32"/>
-        <param name="band1_threadhold_dB" size="3" type="float"/>
-        <param name="band1_compressRatio" size="4" type="float"/>
-        <param name="band1_kneeWidth" size="3" type="float"/>
-        <param name="band1_attackTime_ms" size="4" type="float"/>
-        <param name="band1_releaseTime_ms" size="4" type="float"/>
-        <param name="band1_hysteresis" size="4" type="float"/>
-        <param max="20" min="0" name="band2_delay_ms" type="float"/>
-        <param default="5" max="20" min="0" minInclusive="false" name="band2_rms_ms" type="float"/>
-        <param max="30" min="0" name="band2_gain_dB" type="float"/>
-        <param max="30" min="-30" name="band2_Min_Gain_dB" type="float"/>
-        <param default="1" max="3" min="1" name="band2_numOfKnee" type="uint32"/>
-        <param name="band2_threadhold_dB" size="3" type="float"/>
-        <param name="band2_compressRatio" size="4" type="float"/>
-        <param name="band2_kneeWidth" size="3" type="float"/>
-        <param name="band2_attackTime_ms" size="4" type="float"/>
-        <param name="band2_releaseTime_ms" size="4" type="float"/>
-        <param name="band2_hysteresis" size="4" type="float"/>
-      </struct>
-      <struct id="18">
-        <param max="30" min="-30" name="limiter_gain_dB" type="float"/>
-        <param max="0" min="-30" name="limiter_threadhold_dB" type="float"/>
-        <param max="100" min="0" name="limiter_attackTime_ms" type="float"/>
-        <param max="100" min="0" name="limiter_releaseTime_ms" type="float"/>
-      </struct>
-      <struct id="19">
-        <param name="frequency0" type="uint32"/>
-        <param name="frequency1" type="uint32"/>
-      </struct>
-    </module>
-    <module id="11" name="Stationary Noise Suppression">
-      <param default="0" id="0" max="3" name="opMode_" type="uint32"/>
-      <param default="48000" id="1" name="fs_" type="uint32"/>
-      <param default="2" id="2" name="numCh_" type="uint32"/>
-      <param default="3" id="3" name="chMask_" type="uint32"/>
-      <param default="1" id="16" name="strength level" type="uint32"/>
-      <param id="17" name="POWER_TIME_SMOOTH" type="float"/>
-      <param id="18" name="RMS_TIME_SMOOTH" type="float"/>
-      <param id="19" name="LOWER_BAND_THRESHOLD" size="129" type="float"/>
-      <param id="20" name="UPPER_BAND_THRESHOLD" size="3" type="float"/>
-      <param id="21" name="ATTACK_TIME" type="float"/>
-      <param id="22" name="RELEASE_TIME" type="float"/>
-    </module>
-    <module id="14" name="Linear Gain">
-      <param default="0" id="0" max="3" name="opMode_" type="uint32"/>
-      <param default="48000" id="1" name="fs_" type="uint32"/>
-      <param default="1" id="2" name="numCh_" type="uint32"/>
-      <param default="1" id="3" name="chMask_" type="uint32"/>
-      <param id="16" name="Simple_gain" type="float"/>
-      <param default="0" id="17" name="ch0_assignFrom" type="int32"/>
-      <param default="1" id="18" name="ch1_assignFrom" type="int32"/>
-      <param default="2" id="19" name="ch2_assignFrom" type="int32"/>
-    </module>
-    <module id="17" name="Wind Noise Reduction">
-      <param default="0" id="0" max="3" name="opMode_" type="uint32"/>
-      <param default="48000" id="1" name="fs_" type="uint32"/>
-      <param default="2" id="2" name="numCh_" type="uint32"/>
-      <param default="3" id="3" name="chMask_" type="uint32"/>
-      <param default="450" id="16" name="DECISION_SMOOTHING_FACTOR" type="int32"/>
-      <param default="50" id="17" name="DECISION_ATTACK_SMOOTHING_FACTOR" type="int32"/>
-      <param default="50" id="18" name="DECISION_RELEASE_HIGH_SMOOTHING_FACTOR" type="int32"/>
-      <param default="50" id="19" name="DECISION_RELEASE_LOW_SMOOTHING_FACTOR" type="int32"/>
-      <param default="700" id="20" name="DECISION_RELEASE_THRESHOLD" type="int32"/>
-      <param default="0" id="21" name="DECISION_RANGE_OFFSET_FACTOR" type="int32"/>
-      <param default="1000" id="22" name="DECISION_RANGE_SLOPE_FACTOR" type="int32"/>
-      <param default="450" id="23" name="DECISION_GAIN_SMOOTHING_FACTOR" type="int32"/>
-      <param default="27" id="24" name="DECISION_DB_RANGE" type="int32"/>
-      <param default="1000" id="25" name="MASTER_REDUCTION_FACTOR" type="int32"/>
-      <param default="15" id="26" name="KEEP_NUM_OF_PREV_DECISIONS" type="int32"/>
-      <param default="1000" id="27" name="DEC_PRE_GAIN" type="int32"/>
-      <param default="16000" id="28" name="SUP_PRE_GAIN" type="int32"/>
-      <param default="2" id="29" name="COHERENCE_ENABLE" type="int32"/>
-      <param default="1" id="30" name="COHERENCE_START_BIN" type="int32"/>
-      <param default="10" id="31" name="COHERENCE_END_BIN" type="int32"/>
-      <param default="300" id="32" name="COHERENCE_THRESHOLD" type="int32"/>
-      <param default="990" id="33" name="COHERENCE_FORGETTING_FACTOR" type="int32"/>
-      <param default="0" id="34" name="DB_SCALING_FACTOR" type="int32"/>
-      <param default="9" id="35" name="SEP_LAYER" type="int32"/>
-      <param default="1" id="36" name="SP_GAIN_ENABLE" type="int32"/>
-      <param default="15" id="37" name="SP_GAIN_MAX_BIN" type="int32"/>
-      <param default="500" id="38" name="SP_GAIN_MIN" type="int32"/>
-      <param default="200" id="39" name="SP_GAIN_TH_MIN" type="int32"/>
-      <param default="450" id="40" name="SP_GAIN_TH_MAX" type="int32"/>
-      <param default="800" id="41" name="SP_GAIN_SMOOTH" type="int32"/>
-      <param default="3" id="42" name="SP_GAIN_FREQ_SMOOTH" type="int32"/>
-      <param default="300" id="43" name="MASTER_MAX_SUP_SMOOTHING_FACTOR" type="int32"/>
-      <param default="1" id="44" name="GAIN_FREQ_SMOOTH" type="int32"/>
-      <param default="2" id="45" name="GMIN_CURVE_TYPE" type="int32"/>
-      <param default="55" id="46" name="GMIN_LINEAR_SPLIT_MID_POINT_BINR" type="int32"/>
-      <param default="330" id="47" name="GMIN_LINEAR_SPLIT_MID_POINT_VAL" type="int32"/>
-      <param default="1000" id="48" name="SP_OVERSUB_RATIO" type="int32"/>
-      <param default="16" id="49" name="WIND_ENERGY_EST_COMPENSATION_GAIN" type="int32"/>
-      <param default="2000" id="50" name="WIND_ENERGY_CURVE_SLOPE" type="int32"/>
-      <param default="300" id="51" name="WIND_ENERGY_CURVE_OFFSET" type="int32"/>
-      <param default="16000" id="52" name="WIND_ENERGY_CURVE_MIN" type="int32"/>
-      <param default="16000" id="53" name="WIND_ENERGY_CURVE_MAX" type="int32"/>
-      <param default="900" id="54" name="WIND_ENERGY_SMOOTHING" type="int32"/>
-      <param default="144" id="55" name="WIND_ENERGY_NORM_DENOM" type="int32"/>
-      <param default="600" id="56" name="WIND_ENERGY_CURVE_SCALED_TH_MIN" type="int32"/>
-      <param default="900" id="57" name="WIND_ENERGY_CURVE_SCALED_TH_MAX" type="int32"/>
-      <param default="1" id="58" name="ENABLE_ML_COMBI_WIND_ENERGY" type="int32"/>
-      <param default="1" id="59" name="ENABLE_SP_COMBI_WIND_ENERGY" type="int32"/>
-      <param default="1" id="60" name="ENALBE_SP_COMBI_OVERSUBTRACTION" type="int32"/>
-      <param default="1" id="61" name="ENABLE_PRIORI_SNR" type="int32"/>
-      <param default="1000" id="62" name="PRIORI_SNR_ML_TUNING" type="int32"/>
-      <param default="15" id="63" name="DEC_PREV_NUM" type="int32"/>
-      <param default="1" id="64" name="SSC_ENABLE" type="int32"/>
-      <param default="930" id="65" name="SSC_SOFT_SMOOTHING_FACTOR" type="int32"/>
-      <param default="1600" id="66" name="SSC_OVERDRIVE" type="int32"/>
-      <param default="3" id="67" name="SSC_MIN_FREQ" type="int32"/>
-      <param default="130" id="68" name="SSC_MAX_FREQ" type="int32"/>
-      <param default="700" id="69" name="SSC_PSD_SMOOTHING_FACTOR" type="int32"/>
-      <param default="12" id="70" name="SSC_SOFT_DECISION_MIN_FREQ" type="int32"/>
-      <param default="450" id="71" name="SSC_SOFT_DECISION_MAX_FREQ" type="int32"/>
-      <param default="5" id="72" name="SSC_KEEP_SAVED_PROB_SMOOTH_SIZE" type="int32"/>
-      <param default="1000" id="73" name="GAIN_BOOSTING_COST" type="int32"/>
-    </module>
-    <module id="18" name="Multi Channel IIR 1">
-      <param default="0" id="0" max="3" name="opMode_" type="uint32"/>
-      <param default="48000" id="1" name="fs_" type="uint32"/>
-      <param default="2" id="2" name="numCh_" type="uint32"/>
-      <param default="3" id="3" name="chMask_" type="uint32"/>
-      <param default="3" id="16" max="3" min="1" name="numOfChannel" type="uint32"/>
-      <param id="17" name="coeff" size="300" type="float"/>
-      <struct id="18">
-        <param max="18" min="-96" name="gain" size="60" type="float"/>
-        <param max="24000" min="0" name="frequency" size="60" type="uint32"/>
-        <param max="200" min="0" name="qfactor" size="60" type="float"/>
-        <param default="4" name="type" size="60" type="int32"/>
-      </struct>
-    </module>
-    <module id="32" name="Single Band DRC">
-      <param default="1" id="0" max="3" name="opMode_" type="uint32"/>
-      <param default="48000" id="1" name="fs_" type="uint32"/>
-      <param default="2" id="2" name="numCh_" type="uint32"/>
-      <param default="3" id="3" name="chMask_" type="uint32"/>
-      <struct id="16">
-        <param max="20" min="0" name="delay_ms" type="float"/>
-        <param default="5" max="20" min="0" minInclusive="false" name="rms_ms" type="float"/>
-        <param max="30" min="0" name="gain_dB" type="float"/>
-        <param max="30" min="-30" name="Min_Gain_dB" type="float"/>
-        <param default="1" max="3" min="1" name="numOfKnee" type="uint32"/>
-        <param name="threadhold_dB" size="3" type="float"/>
-        <param name="compressRatio" size="4" type="float"/>
-        <param name="kneeWidth" size="3" type="float"/>
-        <param name="attackTime_ms" size="4" type="float"/>
-        <param name="releaseTime_ms" size="4" type="float"/>
-        <param name="hysteresis" size="4" type="float"/>
-      </struct>
-      <struct id="17">
-        <param max="30" min="-30" name="limiter_gain_dB" type="float"/>
-        <param max="0" min="-30" name="limiter_threadhold_dB" type="float"/>
-        <param max="100" min="0" name="limiter_attackTime_ms" type="uint32"/>
-        <param max="100" min="0" name="limiter_releaseTime_ms" type="uint32"/>
-      </struct>
-    </module>
-    <module id="10000" name="Eraser">
-      <param id="275" name="eraser_pre_gain" type="uint32"/>
-      <param id="277" name="eraser_post_gain" type="uint32"/>
-      <param id="279" name="non_eraser_gain" type="uint32"/>
-    </module>
-    <module id="10001" name="Cleaner">
-      <param id="299" name="cleaner_post_gain" type="uint32"/>
-    </module>
-    <module id="10002" name="CHRE">
-      <param id="297" name="chre_gain" type="uint32"/>
-    </module>
-  </modules>
-  <signalflows>
-    <signalflow id="1" name="Spatial Audio">
-      <block id="128">
-        <moduleRef id="18"/>
-        <moduleRef id="17"/>
-      </block>
-      <block id="134">
-        <moduleRef id="14"/>
-        <moduleRef id="11"/>
-        <moduleRef id="6"/>
-        <moduleRef id="7"/>
-        <moduleRef id="5"/>
-        <moduleRef id="8"/>
-      </block>
-    </signalflow>
-    <signalflow id="2" name="General Mic Recording">
-      <block id="137">
-        <moduleRef id="14"/>
-        <moduleRef id="7"/>
-        <moduleRef id="8"/>
-      </block>
-    </signalflow>
-    <signalflow id="1000" name="Smart Feature">
-      <block id="0">
-        <moduleRef id="10000"/>
-        <moduleRef id="10001"/>
-        <moduleRef id="10002"/>
-      </block>
-    </signalflow>
-  </signalflows>
-</template>
--- a/audio/lynx/tuning/bluenote/tuning_constraints_combination.xml
+++ b/audio/lynx/tuning/bluenote/tuning_constraints_combination.xml
--- a/audio/lynx/tuning/fortemedia/BLUETOOTH.mods
+++ b/audio/lynx/tuning/fortemedia/BLUETOOTH.mods
--- a/audio/lynx/tuning/fortemedia/HANDSET.mods
+++ b/audio/lynx/tuning/fortemedia/HANDSET.mods
--- a/audio/lynx/tuning/fortemedia/HANDSFREE.mods
+++ b/audio/lynx/tuning/fortemedia/HANDSFREE.mods
--- a/audio/lynx/tuning/fortemedia/HEADSET.mods
+++ b/audio/lynx/tuning/fortemedia/HEADSET.mods
--- a/bluetooth/qti_default.mk
+++ b/bluetooth/qti_default.mk
@@ -84,11 +84,6 @@ PRODUCT_COPY_FILES += \
 	device/google/lynx/bluetooth/bluetooth_power_limits_Lynx_G0DZQ_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_G0DZQ_JP.csv \
 	device/google/lynx/bluetooth/bluetooth_power_limits_Lynx_G82U8_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_G82U8_JP.csv

-# Bluetooth SAR test tools
-ifneq (,$(filter true, $(TARGET_USE_QTI_BT_SAR_V1_1) $(TARGET_USE_QTI_BT_SAR)))
-   PRODUCT_PACKAGES_ENG += bluetooth_sar_test
-endif
-
 # Bluetooth (Vendor) SoC, BDA in device tree, and WiPower
 PRODUCT_PROPERTY_OVERRIDES += \
 	vendor.qcom.bluetooth.soc=hastings \
@@ -96,12 +91,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	ro.vendor.bluetooth.emb_wp_mode=false \
 	ro.vendor.bluetooth.wipower=false

-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PROPERTY_OVERRIDES += \
-	persist.vendor.service.bdroid.soclog=true \
-	persist.vendor.service.bdroid.fwsnoop=true
-else
 PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.service.bdroid.soclog=false \
 	persist.vendor.service.bdroid.fwsnoop=false
-endif
--- a/conf/init.lynx.rc
+++ b/conf/init.lynx.rc
@@ -107,6 +107,7 @@ on property:vendor.all.modules.ready=1
    chown system system /sys/bus/i2c/devices/8-0043/default/braking_time_ms
    chown system system /sys/bus/i2c/devices/8-0043/default/f0_offset
    chown system system /sys/bus/i2c/devices/8-0043/default/owt_free_space
+    chown system system /sys/bus/i2c/devices/8-0043/default/owt_lib_compat
    chown system system /sys/bus/i2c/devices/8-0043/default/f0_comp_enable
    chown system system /sys/bus/i2c/devices/8-0043/default/redc_comp_enable
    chown system system /sys/bus/i2c/devices/8-0043/default/delay_before_stop_playback_us
--- a/device-evolution.mk
+++ b/device-evolution.mk
@@ -0,0 +1,9 @@
+#
+# Copyright (C) 2024 The Evolution X Project
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/overlay-evolution
+
+TARGET_HAS_UDFPS += true
--- a/device-lineage.mk
+++ b/device-lineage.mk
@@ -30,11 +30,9 @@ include device/google/gs-common/wireless_charger/wireless_charger.mk

 # Build necessary packages for vendor

-# Codec2
+# Dumpstate
 PRODUCT_PACKAGES += \
-    libacryl \
-    libacryl_hdr_plugin \
-    libexynosv4l2
+    dump_gsc.sh

 # Fingerprint
 PRODUCT_COPY_FILES += \
--- a/device-lynx.mk
+++ b/device-lynx.mk
@@ -15,16 +15,8 @@
 #

 TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_LYNX_VERSION)
-# Keeps flexibility for kasan and ufs builds
-TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_LYNX_DIR)
-TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_LYNX_DIR)/kernel-headers
-
-$(call inherit-product-if-exists, vendor/google_devices/lynx/prebuilts/device-vendor-lynx.mk)
-$(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk)
-$(call inherit-product-if-exists, vendor/google_devices/gs201/proprietary/device-vendor.mk)
-$(call inherit-product-if-exists, vendor/google_devices/lynx/proprietary/lynx/device-vendor-lynx.mk)
-$(call inherit-product-if-exists, vendor/google_devices/lynx/proprietary/device-vendor.mk)
-$(call inherit-product-if-exists, vendor/google_devices/lynx/proprietary/WallpapersLynx.mk)
+TARGET_KERNEL_DIR := device/google/lynx-kernels/evolution
+TARGET_BOARD_KERNEL_HEADERS := $(TARGET_KERNEL_DIR)/kernel-headers

 DEVICE_PACKAGE_OVERLAYS += device/google/lynx/lynx/overlay

@@ -46,14 +38,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
        device/google/lynx/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.lynx.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),)
-PRODUCT_COPY_FILES += \
-	device/google/lynx/init.insmod.lynx.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.lynx.cfg
-endif
-
 # Camera
 PRODUCT_COPY_FILES += \
 	device/google/lynx/media_profiles_lynx.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml
@@ -157,15 +141,6 @@ include device/google/lynx/bluetooth/qti_default.mk
 # 	ro.hardware.keystore=software \
 # 	ro.hardware.gatekeeper=software

-# Fingerprint HAL
-GOODIX_CONFIG_BUILD_VERSION := g7_trusty
-$(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)
-else
-$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_factory.mk)
-endif
-
 # Vibrator HAL
 $(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION)))
 ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1
@@ -183,36 +158,22 @@ PRODUCT_VENDOR_PROPERTIES += \
 PRODUCT_VENDOR_PROPERTIES += \
    vendor.audio.hapticgenerator.distortion.output.gain=0.29

-# Trusty liboemcrypto.so
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts
-
 # Location
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_COPY_FILES += \
+    device/google/lynx/location/lhd_user.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
+    device/google/lynx/location/scd_user.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
+ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
    PRODUCT_COPY_FILES += \
-        device/google/lynx/location/lhd.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
-        device/google/lynx/location/scd.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
-    ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
-        PRODUCT_COPY_FILES += \
-            device/google/lynx/location/gps.6.1.xml.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
-    else
-        PRODUCT_COPY_FILES += \
-            device/google/lynx/location/gps.xml.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
-    endif
+        device/google/lynx/location/gps_user.6.1.xml.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
 else
    PRODUCT_COPY_FILES += \
-        device/google/lynx/location/lhd_user.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
-        device/google/lynx/location/scd_user.conf.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
-    ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
-        PRODUCT_COPY_FILES += \
-            device/google/lynx/location/gps_user.6.1.xml.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
-    else
-        PRODUCT_COPY_FILES += \
-            device/google/lynx/location/gps_user.xml.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
-    endif
+        device/google/lynx/location/gps_user.xml.l10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
 endif

 # Wifi HAL
-PRODUCT_SOONG_NAMESPACES += hardware/qcom/wlan/wcn6740
+PRODUCT_SOONG_NAMESPACES += \
+    hardware/qcom/wlan \
+    hardware/qcom/wlan/wcn6740

 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -275,6 +236,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Fingerprint als feed forward
 PRODUCT_VENDOR_PROPERTIES += \
    persist.vendor.udfps.als_feed_forward_supported=true \
+    persist.vendor.udfps.fps_touch_handler_supported=false \
    persist.vendor.udfps.lhbm_controlled_in_hal_supported=true

 # Hide cutout overlays
@@ -326,12 +288,6 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.audio.cca.enabled=false

-# eng specific
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-    PRODUCT_COPY_FILES += \
-        device/google/gs201/init.hardware.wlc.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.wlc.rc
-endif
-
 # SKU specific RROs
 PRODUCT_PACKAGES += \
    SettingsOverlayG82U8 \
@@ -352,10 +308,3 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Raven: 0x410B
 PRODUCT_PRODUCT_PROPERTIES += \
    bluetooth.device_id.product_id=16651
-
-# 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
--- a/evolution.dependencies
+++ b/evolution.dependencies
@@ -0,0 +1,16 @@
+[
+  {
+    "repository": "device_google_gs201",
+    "target_path": "device/google/gs201"
+  },
+  {
+    "remote": "evo-tensor",
+    "repository": "device_google_lynx-kernels_evolution",
+    "target_path": "device/google/lynx-kernels/evolution"
+  },
+  {
+    "remote": "evo-tensor",
+    "repository": "vendor_google_lynx",
+    "target_path": "vendor/google/lynx"
+  }
+]
--- a/factory-images/generate-factory-images-package.sh
+++ b/factory-images/generate-factory-images-package.sh
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-# Copyright 2023 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.
-
-source ../../../common/clear-factory-images-variables.sh
-BUILD=9456232
-DEVICE=lynx
-PRODUCT=lynx
-VERSION=td4a.221205.017
-SRCPREFIX=signed-
-BOOTLOADER=lynx-1.0-9450676
-RADIO=g5300n-221222-221226-b-9437664
-source ../../../common/generate-factory-images-common.sh
--- a/factory_lynx.mk
+++ b/factory_lynx.mk
@@ -1,40 +0,0 @@
-#
-# Copyright 2021 The Android Open-Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-TARGET_LINUX_KERNEL_VERSION := 5.10
-
-$(call inherit-product, device/google/gs201/factory_common.mk)
-$(call inherit-product, device/google/lynx/device-lynx.mk)
-include device/google/lynx/audio/lynx/factory-audio-tables.mk
-
-PRODUCT_NAME := factory_lynx
-PRODUCT_DEVICE := lynx
-PRODUCT_MODEL := Factory build on Lynx
-PRODUCT_BRAND := Android
-PRODUCT_MANUFACTURER := Google
-
-# default BDADDR for EVB only
-PRODUCT_PROPERTY_OVERRIDES += \
-	ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
-
-# Factory binaries of camera
-PRODUCT_PACKAGES += fatp_imx787_hat_tool
-
-# Factory binaries of wifi
-PRODUCT_PACKAGES += athdiag
-PRODUCT_PACKAGES += libdiag
-PRODUCT_PACKAGES += libtime_genoff
-PRODUCT_PACKAGES += cnss_diag
--- a/init.insmod.lynx.cfg
+++ b/init.insmod.lynx.cfg
@@ -1,18 +0,0 @@
-##########################################################
-#           init.insmod.lynx.cfg                         #
-# This file contains lynx specific kernel modules        #
-# to load at init time by init.insmod.sh script          #
-##########################################################
-
-# Load device specific kernel modules
-# Modules here will be loaded *after* all common modules
-modprobe|snd-soc-cs35l41-spi.ko
-modprobe|goodix_brl_touch.ko
-modprobe|focal_touch.ko
-modprobe|cs40l26-i2c.ko
-modprobe|snd-soc-cs40l26.ko
-
-# All device specific modules loaded
-setprop|vendor.device.modules.ready
-setprop|vendor.all.modules.ready
-setprop|vendor.all.devices.ready
--- a/lineage.dependencies
+++ b/lineage.dependencies
@@ -1,11 +0,0 @@
-[
-  {
-    "repository": "android_device_google_gs201",
-    "target_path": "device/google/gs201"
-  },
-  {
-    "repository": "device/google/lynx-kernels/6.1",
-    "target_path": "device/google/lynx-kernels/6.1",
-    "remote": "aosp-lynx"
-  }
-]
--- a/lineage_lynx.mk
+++ b/lineage_lynx.mk
@@ -14,7 +14,9 @@ DEVICE_PATH := device/google/lynx
 VENDOR_PATH := vendor/google/lynx
 $(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk)
 $(call inherit-product, device/google/gs201/lineage_common.mk)
+$(call inherit-product, device/google/gs201/evolution_common.mk)
 $(call inherit-product, $(DEVICE_PATH)/$(DEVICE_CODENAME)/device-lineage.mk)
+$(call inherit-product, $(DEVICE_PATH)/$(DEVICE_CODENAME)/device-evolution.mk)

 # Device identifier. This must come after all inclusions
 PRODUCT_BRAND := google
@@ -26,8 +28,8 @@ TARGET_SCREEN_HEIGHT := 2400
 TARGET_SCREEN_WIDTH := 1080

 PRODUCT_BUILD_PROP_OVERRIDES += \
-    BuildDesc="lynx-user 15 BP1A.250505.005.B1 13277630 release-keys" \
-    BuildFingerprint=google/lynx/lynx:15/BP1A.250505.005.B1/13277630:user/release-keys \
+    BuildDesc="lynx-user 16 BP2A.250805.005 13691446 release-keys" \
+    BuildFingerprint=google/lynx/lynx:16/BP2A.250805.005/13691446:user/release-keys \
    DeviceProduct=$(DEVICE_CODENAME)

 $(call inherit-product, $(VENDOR_PATH)/$(DEVICE_CODENAME)-vendor.mk)
--- a/location/gps.6.1.xml.l10
+++ b/location/gps.6.1.xml.l10
@@ -1,106 +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"
-       SuplUseFwCellInfo="false"
-       SuplDummyCellInfo ="true"
-       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"
-       CpLppHighAccuracyShapeMode="1"
-       ReAidingOnHotStart="false"
-       ReAidingIntervalSec="3600"
-       RuntimeSwLteFilterEnable="true"
-       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"
-       MultiCarrLnaMask="L1_EXT_ON"
-       RfType="GL_RF_4776_BRCM"
-
-       WarmStandbyTimeout1Seconds="10"
-       WarmStandbyTimeout2Seconds="15"
-
-       EnableGnssPropagateInStandby="true"
-
-       RfPathLossDb_Ap="4"
-       RfPathLossDb_Cp="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"
-  />
-
-</glgps>
-
--- a/location/gps.xml.l10
+++ b/location/gps.xml.l10
@@ -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="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"
-       SuplUseFwCellInfo="false"
-       SuplDummyCellInfo ="true"
-       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"
-       CpLppHighAccuracyShapeMode="1"
-       ReAidingOnHotStart="false"
-       ReAidingIntervalSec="3600"
-       RuntimeSwLteFilterEnable="true"
-       PpsDevice="/sys/class/pps/pps0/assert_elapsed"
-       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"
-       MultiCarrLnaMask="L1_EXT_ON"
-       RfType="GL_RF_4776_BRCM"
-
-       WarmStandbyTimeout1Seconds="10"
-       WarmStandbyTimeout2Seconds="15"
-
-       EnableGnssPropagateInStandby="true"
-
-       RfPathLossDb_Ap="4"
-       RfPathLossDb_Cp="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"
-       ConstellationAutoSwitchOffNavOnly="true"
-  />
-
-</glgps>
-
--- a/location/gps_user.6.1.xml.l10
+++ b/location/gps_user.6.1.xml.l10
@@ -59,6 +59,9 @@
       CpLppeCancelDbhOnAgnssProvideLoc="true"
       CpLppeUseAgnssLocForEmptyDbh="true"
       CpLppHighAccuracyShapeMode="1"
+       CpLppDisableUEAInLTE="true"
+       CpLppGalileoCapable="true"
+       CpLppGalileoIE="true"
       ReAidingOnHotStart="false"
       ReAidingIntervalSec="3600"
       RuntimeSwLteFilterEnable="true"
--- a/location/lhd.conf.l10
+++ b/location/lhd.conf.l10
@@ -1,34 +0,0 @@
-LheName=bbd
-
-LheRsmResetTimeoutMS=10000
-GpioNStdbyPath=/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby
-
-LhePatch=/vendor/firmware/SensorHub.patch
-Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG
-LheConsole=/data/vendor/gps/LheConsole
-
-LogEnabled=true
-Log=JAVA
-LogDirectory=/sdcard/gps/broadcom/storage
-
-LheBbdPacket=/dev/ttyBCM
-
-LheBbdControl=/dev/bbd_control
-
-# LheBbdSensor=/dev/bbd_sensor
-
-LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt
-LogLevel=*:I
-
-NvStorageDir=/data/vendor/gps/
-
-# Enable BBD debugging at these stages:
-# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD
-
-LheAutoBaudDelayMS=10
-TrafficLogEnabled=false
-SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf
-
-SkipSensorWakeLock=true
-LoggerWakeLockEnable=false
-PpsEnable=true
--- a/location/scd.conf.l10
+++ b/location/scd.conf.l10
@@ -1,6 +0,0 @@
-LogEnabled=true
-Log=JAVA
-LogDirectory=/sdcard/gps/broadcom/storage
-NvStorageDir=/data/vendor/gps/
-TcpConnectionTimeout=20
-SecondaryConfigPath=/data/vendor/gps/overlay/scd_overlay.conf
--- a/lynx/BoardConfig.mk
+++ b/lynx/BoardConfig.mk
@@ -30,6 +30,7 @@ endif

 BOARD_USES_GENERIC_AUDIO := true
 USES_DEVICE_GOOGLE_LYNX := true
+$(call soong_config_set_bool,prebuilts_wlan,USES_DEVICE_GOOGLE_LYNX,$(USES_DEVICE_GOOGLE_LYNX))

 # Enable load module in parallel
 BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
@@ -39,18 +40,11 @@ BOARD_KERNEL_CMDLINE += fips140.load_sequential=1
 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1

 include device/google/gs201/BoardConfig-common.mk
-include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk
 include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
-include vendor/google_devices/lynx/proprietary/BoardConfigVendor.mk
 include device/google/lynx/sepolicy/lynx-sepolicy.mk
 include device/google/gs201/wifi/qcom/BoardConfig-wifi.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/lynx
 VENDOR_PATH := vendor/google/lynx
 include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk
+include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigEvolution.mk
--- a/lynx/BoardConfigEvolution.mk
+++ b/lynx/BoardConfigEvolution.mk
@@ -0,0 +1,6 @@
+#
+# SPDX-FileCopyrightText: 2024 The Evolution X Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+include $(DEVICE_PATH)/BoardConfigEvolution.mk
--- a/lynx/device-evolution.mk
+++ b/lynx/device-evolution.mk
@@ -0,0 +1,8 @@
+#
+# SPDX-FileCopyrightText: 2024 The Evolution X Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+$(call inherit-product, $(DEVICE_PATH)/device-evolution.mk)
+
+DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/$(DEVICE_CODENAME)/overlay-evolution
--- a/lynx/extract-files.py
+++ b/lynx/extract-files.py
@@ -29,8 +29,6 @@ from extract_utils.main import (
 namespace_imports = [
    'device/google/lynx',
    'hardware/google/av',
-    'hardware/google/gchips',
-    'hardware/google/graphics/common',
    'hardware/google/interfaces',
    'hardware/google/pixel',
    'hardware/qcom/wlan/wcn6740',
--- a/lynx/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml
+++ b/lynx/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2019-2024 The Evolution X Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- Android version screen, build maintainer -->
+    <string name="build_maintainer_summary" translatable="false">Anierin Bliss</string>
+    <string name="build_maintainer_donate_url" translatable="false">https://PayPal.me/AnierinB</string>
+</resources>
--- a/lynx/proprietary-files-carriersettings.txt
+++ b/lynx/proprietary-files-carriersettings.txt
@@ -9,12 +9,15 @@ product/etc/CarrierSettings/a1_bg.pb
 product/etc/CarrierSettings/a1_hr.pb
 product/etc/CarrierSettings/a1_mk.pb
 product/etc/CarrierSettings/a1_si.pb
+product/etc/CarrierSettings/a1mpn_at.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/alestra_mx.pb
+product/etc/CarrierSettings/aliv_bs.pb
 product/etc/CarrierSettings/altice_us.pb
 product/etc/CarrierSettings/alticeroaming_us.pb
 product/etc/CarrierSettings/andorratelecom_ad.pb
@@ -25,13 +28,17 @@ 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/att4g_mx.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_mx.pb
 product/etc/CarrierSettings/attmvnos_us.pb
 product/etc/CarrierSettings/axis_id.pb
+product/etc/CarrierSettings/bait_mx.pb
+product/etc/CarrierSettings/bark_us.pb
 product/etc/CarrierSettings/base_be.pb
 product/etc/CarrierSettings/batelco_bh.pb
 product/etc/CarrierSettings/bell_ca.pb
@@ -52,6 +59,7 @@ product/etc/CarrierSettings/celcom_my.pb
 product/etc/CarrierSettings/cellcom_il.pb
 product/etc/CarrierSettings/cellcom_us.pb
 product/etc/CarrierSettings/cellcommno_us.pb
+product/etc/CarrierSettings/cellfie_ge.pb
 product/etc/CarrierSettings/celluarone_us.pb
 product/etc/CarrierSettings/chatr_ca.pb
 product/etc/CarrierSettings/chinamobile_hk.pb
@@ -101,6 +109,7 @@ 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/esimgo_gb.pb
 product/etc/CarrierSettings/esn_gb.pb
 product/etc/CarrierSettings/etisalat_ae.pb
 product/etc/CarrierSettings/euskaltel_es.pb
@@ -116,6 +125,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/fliggsmobile_us.pb
 product/etc/CarrierSettings/foroyatele_fo.pb
 product/etc/CarrierSettings/free_fr.pb
 product/etc/CarrierSettings/free_gp.pb
@@ -130,10 +140,12 @@ 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/gta_us.pb
 product/etc/CarrierSettings/guuk_es.pb
 product/etc/CarrierSettings/h3_at.pb
 product/etc/CarrierSettings/h3_gb.pb
 product/etc/CarrierSettings/h3_ie.pb
+product/etc/CarrierSettings/h3_lk.pb
 product/etc/CarrierSettings/h3_se.pb
 product/etc/CarrierSettings/h3g27202_ie.pb
 product/etc/CarrierSettings/halebop_se.pb
@@ -141,6 +153,7 @@ product/etc/CarrierSettings/helium_us.pb
 product/etc/CarrierSettings/help_at.pb
 product/etc/CarrierSettings/homobile_it.pb
 product/etc/CarrierSettings/hotmobile_il.pb
+product/etc/CarrierSettings/humane_us.pb
 product/etc/CarrierSettings/ice_no.pb
 product/etc/CarrierSettings/idea_in.pb
 product/etc/CarrierSettings/idmobile_gb.pb
@@ -148,9 +161,12 @@ 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/izziatt_mx.pb
 product/etc/CarrierSettings/jazz_pk.pb
 product/etc/CarrierSettings/jazztel_es.pb
 product/etc/CarrierSettings/jcommobile_jp.pb
+product/etc/CarrierSettings/joonto_us.pb
+product/etc/CarrierSettings/kajeetmvno_us.pb
 product/etc/CarrierSettings/kddi5gsa_jp.pb
 product/etc/CarrierSettings/kddi_jp.pb
 product/etc/CarrierSettings/kddimvno5gsa_jp.pb
@@ -182,12 +198,15 @@ 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/megamovil_mx.pb
 product/etc/CarrierSettings/melita_mt.pb
 product/etc/CarrierSettings/meo_pt.pb
 product/etc/CarrierSettings/metropcs_us.pb
+product/etc/CarrierSettings/mettel_us.pb
 product/etc/CarrierSettings/mobifone_vn.pb
 product/etc/CarrierSettings/mobily_sa.pb
 product/etc/CarrierSettings/monacotelecom_mc.pb
+product/etc/CarrierSettings/movistar_cl.pb
 product/etc/CarrierSettings/movistar_co.pb
 product/etc/CarrierSettings/movistar_es.pb
 product/etc/CarrierSettings/movistar_mx.pb
@@ -195,12 +214,14 @@ 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/newww_mx.pb
 product/etc/CarrierSettings/nexphone_ch.pb
 product/etc/CarrierSettings/nextech_us.pb
 product/etc/CarrierSettings/no_sim.pb
 product/etc/CarrierSettings/nos_pt.pb
 product/etc/CarrierSettings/nova_gr.pb
 product/etc/CarrierSettings/nova_is.pb
+product/etc/CarrierSettings/nymobile_us.pb
 product/etc/CarrierSettings/o2_cz.pb
 product/etc/CarrierSettings/o2_de.pb
 product/etc/CarrierSettings/o2_sk.pb
@@ -225,6 +246,7 @@ product/etc/CarrierSettings/orange_re.pb
 product/etc/CarrierSettings/orange_ro.pb
 product/etc/CarrierSettings/orange_sk.pb
 product/etc/CarrierSettings/others.pb
+product/etc/CarrierSettings/oxio_us.pb
 product/etc/CarrierSettings/paradisemobile_bm.pb
 product/etc/CarrierSettings/partner_il.pb
 product/etc/CarrierSettings/pcmobilebell_ca.pb
@@ -244,11 +266,15 @@ 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/reach_us.pb
+product/etc/CarrierSettings/reallycommunications_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/roccstar_us.pb
+product/etc/CarrierSettings/rockisland_us.pb
 product/etc/CarrierSettings/rogers5g_ca.pb
 product/etc/CarrierSettings/rogers_ca.pb
 product/etc/CarrierSettings/rogerswpn_ca.pb
@@ -266,9 +292,11 @@ 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/sky_mx.pb
 product/etc/CarrierSettings/skylo_zz.pb
 product/etc/CarrierSettings/smart_ph.pb
 product/etc/CarrierSettings/smartfren_id.pb
+product/etc/CarrierSettings/smartless_us.pb
 product/etc/CarrierSettings/smartone_hk.pb
 product/etc/CarrierSettings/smarty_gb.pb
 product/etc/CarrierSettings/softbank_jp.pb
@@ -362,12 +390,14 @@ product/etc/CarrierSettings/truphone_zz.pb
 product/etc/CarrierSettings/tstar_tw.pb
 product/etc/CarrierSettings/turkcell_tr.pb
 product/etc/CarrierSettings/turktelekom_tr.pb
+product/etc/CarrierSettings/tusass_gl.pb
 product/etc/CarrierSettings/twm_tw.pb
 product/etc/CarrierSettings/u264a_ca.pb
 product/etc/CarrierSettings/u264a_us.pb
 product/etc/CarrierSettings/u264ab_ca.pb
 product/etc/CarrierSettings/u264ao_at.pb
 product/etc/CarrierSettings/u264ap_at.pb
+product/etc/CarrierSettings/ubixatt_mx.pb
 product/etc/CarrierSettings/ultra_us.pb
 product/etc/CarrierSettings/umobile_my.pb
 product/etc/CarrierSettings/unifi_my.pb
@@ -377,8 +407,10 @@ product/etc/CarrierSettings/uqmobile5gsa_jp.pb
 product/etc/CarrierSettings/uqmobile_jp.pb
 product/etc/CarrierSettings/uscc_us.pb
 product/etc/CarrierSettings/verizon_us.pb
+product/etc/CarrierSettings/verizononsitelte_us.pb
 product/etc/CarrierSettings/verymobile_it.pb
 product/etc/CarrierSettings/viaero_us.pb
+product/etc/CarrierSettings/vianova_it.pb
 product/etc/CarrierSettings/videotron_ca.pb
 product/etc/CarrierSettings/viettel_vn.pb
 product/etc/CarrierSettings/vimla_se.pb
@@ -412,7 +444,9 @@ 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/wim_mx.pb
 product/etc/CarrierSettings/windtre_it.pb
+product/etc/CarrierSettings/wom_cl.pb
 product/etc/CarrierSettings/xfinity2_us.pb
 product/etc/CarrierSettings/xfinity_us.pb
 product/etc/CarrierSettings/xfinitymso_us.pb
@@ -421,6 +455,7 @@ product/etc/CarrierSettings/yesss_at.pb
 product/etc/CarrierSettings/yettel_bg.pb
 product/etc/CarrierSettings/yettel_hu.pb
 product/etc/CarrierSettings/yoigo_es.pb
+product/etc/CarrierSettings/yomobile_mx.pb
 product/etc/CarrierSettings/zain_bh.pb
 product/etc/CarrierSettings/zain_kw.pb
 product/etc/CarrierSettings/zain_sa.pb
--- a/lynx/proprietary-files-vendor.txt
+++ b/lynx/proprietary-files-vendor.txt
--- a/lynx/proprietary-files.txt
+++ b/lynx/proprietary-files.txt
@@ -3,8 +3,8 @@
 # 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/DevicePersonalizationPrebuiltPixel2022-U.32_V.7_playstore_aiai_20240725.00_RC08/DevicePersonalizationPrebuiltPixel2022-U.32_V.7_playstore_aiai_20240725.00_RC08.apk;PRESIGNED
+product/priv-app/DeviceIntelligenceNetworkPrebuilt-astrea_20240329.00_RC02/DeviceIntelligenceNetworkPrebuilt-astrea_20240329.00_RC02.apk;PRESIGNED
+product/priv-app/DevicePersonalizationPrebuiltPixel2022-bfinal_aiai_20250217.00_RC08/DevicePersonalizationPrebuiltPixel2022-bfinal_aiai_20250217.00_RC08.apk;PRESIGNED

 # Audio
 product/etc/ambient/matcher_tah.leveldb
@@ -13,6 +13,9 @@ product/etc/firmware/music_detector.sound_model
 product/etc/firmware/music_detector.sound_model_2
 product/etc/firmware/music_detector.sound_model_tflite

+# Camera
+product/priv-app/GoogleCamera/GoogleCamera.apk;OVERRIDES=Aperture,Camera2;PRESIGNED
+
 # Camera extensions
 product/etc/permissions/androidx.camera.extensions.impl.xml
 product/priv-app/PixelCameraServices/PixelCameraServices.apk;PRESIGNED
@@ -40,7 +43,7 @@ product/priv-app/HotwordEnrollmentXGoogleFUSIONPro/HotwordEnrollmentXGoogleFUSIO
 product/etc/sysconfig/allowlist_com.shannon.imsservice.xml

 # Permissions
-product/etc/permissions/privapp-permissions-google-p.xml:product/etc/permissions/privapp-permissions-google-p-lineage.xml
+product/etc/permissions/privapp-permissions-google-p.xml:product/etc/permissions/privapp-permissions-google-p-evolution.xml
 product/etc/sysconfig/GoogleCamera_6gb_or_more_ram.xml
 product/etc/sysconfig/google-hiddenapi-package-whitelist.xml
 product/etc/sysconfig/nexus.xml
@@ -64,7 +67,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_53.0.733201674/CarrierSettings_signed_53.0.733201674.apk;PRESIGNED
 product/priv-app/CarrierWifi/CarrierWifi.apk;PRESIGNED
 product/priv-app/ConnMO/ConnMO.apk
 product/priv-app/DCMO/DCMO.apk
@@ -85,11 +88,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
@@ -134,13 +132,8 @@ system_ext/priv-app/PixelQualifiedNetworksService/PixelQualifiedNetworksService.
 system_ext/priv-app/ShannonIms/ShannonIms.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-lineage.xml
+system_ext/etc/permissions/privapp-permissions-google-se.xml:system_ext/etc/permissions/privapp-permissions-google-se-evolution.xml

 # Radio
 system_ext/etc/default-permissions/default-permissions-euiccpixel.xml
@@ -153,6 +146,11 @@ system_ext/framework/google-ril.jar
 system_ext/priv-app/CarrierSetup/CarrierSetup.apk;PRESIGNED
 system_ext/priv-app/ConnectivityThermalPowerManager/ConnectivityThermalPowerManager.apk
 system_ext/priv-app/EuiccGoogleOverlay/EuiccGoogleOverlay.apk
+system_ext/priv-app/EuiccSupportPixel/DKA_0105_P22_DVT.in
+system_ext/priv-app/EuiccSupportPixel/DKA_0105_P22_DVT.up
+system_ext/priv-app/EuiccSupportPixel/DKA_0105_P22_EVT.in
+system_ext/priv-app/EuiccSupportPixel/DKA_0105_P22_EVT.up
+system_ext/priv-app/EuiccSupportPixel/DKA_0109_P22_DVT.up
 system_ext/priv-app/EuiccSupportPixel/DKA_RC7_DVT.in
 system_ext/priv-app/EuiccSupportPixel/DKA_RC7_DVT.up
 system_ext/priv-app/EuiccSupportPixel/DKA_RC7_EVT.up
--- a/lynx/skip-files-vendor.txt
+++ b/lynx/skip-files-vendor.txt
@@ -37,7 +37,7 @@ bin/dos2unix
 bin/du
 bin/dump/dump_aoc
 bin/dump/dump_devfreq
-bin/dump/dump_display
+bin/dump/dump_exynos_display
 bin/dump/dump_fingerprint
 bin/dump/dump_modem
 bin/dump/dump_modemlog
@@ -88,14 +88,11 @@ bin/hostname
 bin/hw/android.hardware.audio.service
 bin/hw/android.hardware.boot-service.default-pixel
 bin/hw/android.hardware.cas@1.2-service
-bin/hw/android.hardware.composer.hwc3-service.pixel
 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.health-service.gs201
 bin/hw/android.hardware.health.storage-service.default
-bin/hw/android.hardware.memtrack-service.pixel
 bin/hw/android.hardware.nfc-service.st
 bin/hw/android.hardware.power-service.pixel-libperfmgr
 bin/hw/android.hardware.power.stats-service.pixel
@@ -170,7 +167,6 @@ bin/paste
 bin/patch
 bin/pgrep
 bin/pidof
-bin/pixelstats-vendor
 bin/pkill
 bin/pmap
 bin/predump_touch.sh
@@ -265,6 +261,10 @@ build.prop
 etc/NOTICE.xml.gz
 etc/a2dp_audio_policy_configuration_7_0.xml
 etc/a2dp_in_audio_policy_configuration_7_0.xml
+etc/aconfig/flag.info
+etc/aconfig/flag.map
+etc/aconfig/flag.val
+etc/aconfig/package.map
 etc/aconfig_flags.pb
 etc/aidl/hfp/hfp_codec_capabilities.xml
 etc/aidl/le_audio/aidl_audio_set_configurations.bfbs
@@ -335,7 +335,6 @@ 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.health-service.gs201.rc
 etc/init/android.hardware.power-service.pixel-libperfmgr.rc
 etc/init/android.hardware.power.stats-service.pixel.rc
@@ -358,7 +357,6 @@ etc/init/hw/init.gs201.rc
 etc/init/hw/init.gs201.storage.rc
 etc/init/hw/init.gs201.usb.rc
 etc/init/hw/init.lynx.rc
-etc/init/hwc3-pixel.rc
 etc/init/init.aoc.rc
 etc/init/init.fingerprint.dump.rc
 etc/init/init.modem.rc
@@ -372,11 +370,9 @@ etc/init/init.touch.predump.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
 etc/init/pixel-thermal-symlinks.rc
-etc/init/pixelstats-vendor.gs201.rc
 etc/init/rebalance_interrupts-vendor.gs101.rc
 etc/init/storage.gs201.rc
 etc/init/vndservicemanager.rc
@@ -414,7 +410,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
@@ -476,6 +472,7 @@ etc/selinux/vendor_property_contexts
 etc/selinux/vendor_seapp_contexts
 etc/selinux/vendor_sepolicy.cil
 etc/selinux/vendor_service_contexts
+etc/selinux/vendor_tee_service_contexts
 etc/selinux/vndservice_contexts
 etc/sound_trigger_configuration.xml
 etc/sysconfig/component-overrides.xml
@@ -504,12 +501,7 @@ 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/hwc3-default.xml
-etc/vintf/manifest/manifest.xml
-etc/vintf/manifest/manifest_gralloc_aidl2.xml
-etc/vintf/manifest/memtrack.xml
 etc/vintf/manifest/nfc-service-default.xml
-etc/vintf/manifest/pixel-display-default.xml
 etc/waves_config.ini
 etc/waves_preset.mps
 etc/wifi/coex_table.xml
@@ -549,11 +541,6 @@ lib/android.hardware.bluetooth.audio@2.0.so
 lib/android.hardware.bluetooth.audio@2.1.so
 lib/android.hardware.common-V2-ndk.so
 lib/android.hardware.common.fmq-V1-ndk.so
-lib/android.hardware.graphics.common-V6-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.mapper@4.0.so
 lib/android.hardware.radio@1.0.so
 lib/android.hardware.radio@1.1.so
 lib/android.hardware.soundtrigger@2.0-core.so
@@ -567,7 +554,6 @@ lib/android.hidl.memory@1.0.so
 lib/android.hidl.safe_union@1.0.so
 lib/android.media.audio.common.types-V4-ndk.so
 lib/android.system.suspend-V1-ndk.so
-lib/arm.graphics-V1-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.soundtrigger@2.3-impl.so
@@ -579,7 +565,6 @@ lib/hw/audio.usb.default.so
 lib/hw/audio.usbv2.default.so
 lib/hw/gralloc.default.so
 lib/hw/local_time.default.so
-lib/hw/mapper.pixel.so
 lib/hw/power.default.so
 lib/hw/vibrator.default.so
 lib/libOpenCL.so
@@ -594,18 +579,14 @@ lib/libc++.so
 lib/libclang_rt.ubsan_standalone-arm-android.so
 lib/libcrypto.so
 lib/libcutils.so
-lib/libdmabufheap.so
 lib/libeffects.so
 lib/libeffectsconfig.so
 lib/libflatbuffers-cpp.so
 lib/libfmq.so
-lib/libgralloctypes.so
 lib/libhardware.so
 lib/libhardware_legacy.so
 lib/libhidlbase.so
 lib/libhidlmemory.so
-lib/libhwjpeg.so
-lib/libion_google.so
 lib/libmedia_helper.so
 lib/libmediautils_vendor.so
 lib/libmemunreachable.so
@@ -762,6 +743,7 @@ lib/modules/i2c-exynos5.ko
 lib/modules/ieee802154.ko
 lib/modules/ieee802154_6lowpan.ko
 lib/modules/ieee802154_socket.ko
+lib/modules/iovad-best-fit-algo.ko
 lib/modules/itmon.ko
 lib/modules/janeiro.ko
 lib/modules/kernel-top.ko
@@ -967,7 +949,6 @@ lib/soundfx/libhapticgenerator.so
 lib/soundfx/libldnhncr.so
 lib/soundfx/libreverbwrapper.so
 lib/soundfx/libvisualizer.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
@@ -1001,31 +982,10 @@ 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-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@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.composer@2.1-resources.so
-lib64/android.hardware.graphics.composer@2.1.so
-lib64/android.hardware.graphics.composer@2.2-resources.so
-lib64/android.hardware.graphics.composer@2.2.so
-lib64/android.hardware.graphics.composer@2.3.so
-lib64/android.hardware.graphics.composer@2.4.so
-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.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.stats-V2-ndk.so
 lib64/android.hardware.power.stats-impl.gs-common.so
@@ -1070,11 +1030,8 @@ lib64/android.hidl.safe_union@1.0.so
 lib64/android.media.audio.common.types-V4-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/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.soundtrigger@2.3-impl.so
 lib64/hw/android.hidl.memory@1.0-impl.so
 lib64/hw/audio.bluetooth.default.so
@@ -1084,15 +1041,12 @@ lib64/hw/audio.usb.default.so
 lib64/hw/audio.usbv2.default.so
 lib64/hw/gralloc.default.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/libaho_corasick.dylib.so
 lib64/libalsautils.so
 lib64/libalsautilsv2.so
 lib64/libandroid_log_sys.dylib.so
@@ -1111,24 +1065,18 @@ lib64/libcrypto.so
 lib64/libcutils.so
 lib64/libdisppower-pixel.so
 lib64/libdmabufheap.so
-lib64/libdrm.so
-lib64/libdrmresource.so
 lib64/libdump.so
 lib64/libdumpstateutil.so
 lib64/libeffects.so
 lib64/libeffectsconfig.so
-lib64/libenv_logger.dylib.so
-lib64/libexynosdisplay.so
+lib64/libenv_filter.dylib.so
 lib64/libflatbuffers-cpp.so
 lib64/libfmq.so
 lib64/libgatekeeper.so
-lib64/libgralloctypes.so
 lib64/libhardware.so
 lib64/libhardware_legacy.so
 lib64/libhidlbase.so
 lib64/libhidlmemory.so
-lib64/libhwjpeg.so
-lib64/libion_google.so
 lib64/libjsoncpp.so
 lib64/libkeymaster_messages.so
 lib64/libkeymasterconfig.so
@@ -1137,7 +1085,7 @@ lib64/liblibloading.dylib.so
 lib64/liblog_rust.dylib.so
 lib64/libmedia_helper.so
 lib64/libmediautils_vendor.so
-lib64/libmemtrack-pixel.so
+lib64/libmemchr.dylib.so
 lib64/libmemunreachable.so
 lib64/libnbaio_mono.so
 lib64/libnl.so
@@ -1145,16 +1093,16 @@ lib64/libonce_cell.dylib.so
 lib64/libperfmgr.so
 lib64/libpixelatoms_defs.so
 lib64/libpixelhealth.so
-lib64/libpixelstats.so
 lib64/libpng.so
 lib64/libpower.so
 lib64/libprocessgroup.so
 lib64/libprotobuf-cpp-full-21.12.so
 lib64/libprotobuf-cpp-lite-21.12.so
 lib64/libreference-ril.so
+lib64/libregex.dylib.so
+lib64/libregex_syntax.dylib.so
 lib64/libril.so
 lib64/librilutils.so
-lib64/libsensorndkbridge.so
 lib64/libspeexresampler.so
 lib64/libssl.so
 lib64/libstagefright_foundation.so
@@ -1163,10 +1111,8 @@ lib64/libtinyalsa.so
 lib64/libtinyalsav2.so
 lib64/libtinyxml2.so
 lib64/libtrusty.so
-lib64/libui.so
 lib64/libusbhost.so
 lib64/libutils.so
-lib64/libvendorgraphicbuffer.so
 lib64/libvibratorutils.so
 lib64/libwifi-hal.so
 lib64/libwifi-system-iface.so
@@ -1279,15 +1225,11 @@ lib/android.hardware.media.c2-V1-ndk.so
 lib/android.hardware.media.c2@1.0.so
 lib/android.hardware.media.omx@1.0.so
 lib/android.hardware.media@1.0.so
-lib/libacryl.so
-lib/libacryl_hdr_plugin.so
 lib/libcodec2.so
 lib/libcodec2_hal_common.so
 lib/libcodec2_hidl@1.0.so
 lib/libcodec2_hidl_plugin.so
 lib/libcodec2_vndk.so
-lib/libexynosutils.so
-lib/libexynosv4l2.so
 lib/libmedia_ecoservice.so
 lib/libmedia_omx.so
 lib/libsfplugin_ccodec_utils.so
@@ -1296,13 +1238,10 @@ lib/libstagefright_bufferpool@2.0.1.so
 lib/libstagefright_bufferqueue_helper.so
 lib/libstagefright_omx_utils.so
 lib/libstagefright_xmlparser.so
-lib/libvendorgraphicbuffer.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
 lib64/android.hardware.media.c2@1.0.so
-lib64/android.hardware.media.c2@1.1.so
-lib64/android.hardware.media.c2@1.2.so
 lib64/android.hardware.media.omx@1.0.so
 lib64/android.hardware.media@1.0.so
 lib64/libavservices_minijail.so
@@ -1311,12 +1250,8 @@ lib64/libcodec2.so
 lib64/libcodec2_aidl.so
 lib64/libcodec2_hal_common.so
 lib64/libcodec2_hidl@1.0.so
-lib64/libcodec2_hidl@1.1.so
-lib64/libcodec2_hidl@1.2.so
 lib64/libcodec2_hidl_plugin.so
 lib64/libcodec2_vndk.so
-lib64/libexynosutils.so
-lib64/libexynosv4l2.so
 lib64/libmedia_ecoservice.so
 lib64/libmedia_omx.so
 lib64/libminijail.so
@@ -1324,16 +1259,9 @@ lib64/libsfplugin_ccodec_utils.so
 lib64/libstagefright_aidl_bufferpool2.so
 lib64/libstagefright_bufferpool@2.0.1.so
 lib64/libstagefright_bufferqueue_helper.so
-lib64/libstagefright_omx.so
 lib64/libstagefright_omx_utils.so
 lib64/libstagefright_xmlparser.so

-# Confirmation UI
-lib64/android.hardware.confirmationui-V1-ndk.so
-lib64/android.hardware.confirmationui-lib.trusty.so
-lib64/android.hardware.confirmationui@1.0.so
-lib64/libteeui_hal_support.so
-
 # Contexthub
 lib/android.hardware.contexthub-V3-ndk.so
 lib64/android.hardware.contexthub-V3-ndk.so
@@ -1345,6 +1273,8 @@ lib64/chremetrics-cpp.so
 etc/permissions/android.hardware.fingerprint.xml

 # GPS
+etc/permissions/android.hardware.location.gps.prebuilt.xml
+lib64/android.hardware.gnss-V3-ndk.so
 lib64/liblzma.so
 lib64/libunwindstack.so

@@ -1363,7 +1293,6 @@ lib64/android.hardware.security.keymint-V3-ndk.so
 lib64/libcppbor.so
 lib64/libcppcose_rkp.so
 lib64/libkeymaster_portable.so
-lib64/libkeymint_support.so
 lib64/libkeymint_support_V3.so
 lib64/libnos.so
 lib64/libnos_client_citadel.so
@@ -1402,20 +1331,20 @@ lib/android.hardware.sensors@2.1.so
 lib/hw/sensors.dynamic_sensor_hal.so
 lib/libhidparser.so
 lib/libsensorndkbridge.so
+lib64/android.frameworks.sensorservice-V1-ndk.so
 lib64/android.hardware.sensors-V2-ndk.so
 lib64/hw/sensors.dynamic_sensor_hal.so
 lib64/libhidparser.so
+lib64/libsensorndkbridge.so

 # Trusty
 lib64/android.trusty.stats.nw.setter-cpp.so
 lib64/libbinder_trusty.so
-lib64/libtrusty_metrics.so

 # Wi-Fi
 lib64/libwifi-hal-ctrl.so

 # Misc interfaces
-lib/android.frameworks.stats-V1-ndk.so
 lib/android.frameworks.stats-V2-ndk.so
 lib/android.hardware.graphics.allocator-V2-ndk.so
 lib/android.hardware.graphics.allocator@2.0.so
@@ -1423,10 +1352,14 @@ 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-V3-ndk.so
+lib/android.hardware.graphics.common-V6-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.mapper@2.0.so
 lib/android.hardware.graphics.mapper@2.1.so
 lib/android.hardware.graphics.mapper@3.0.so
+lib/android.hardware.graphics.mapper@4.0.so
 lib/android.hardware.health-V1-ndk.so
 lib/android.hardware.radio-V1-ndk.so
 lib/android.hardware.radio.config-V1-ndk.so
@@ -1455,21 +1388,39 @@ 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.gnss-V3-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.bufferqueue@1.0.so
 lib64/android.hardware.graphics.bufferqueue@2.0.so
+lib64/android.hardware.graphics.common-V6-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.composer@2.1-resources.so
+lib64/android.hardware.graphics.composer@2.1.so
+lib64/android.hardware.graphics.composer@2.2-resources.so
+lib64/android.hardware.graphics.composer@2.2.so
+lib64/android.hardware.graphics.composer@2.3.so
+lib64/android.hardware.graphics.composer@2.4.so
+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-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@3.0.so
-lib64/android.hardware.keymaster@4.0.so
+lib64/android.hardware.memtrack-V1-ndk.so
 lib64/android.hardware.neuralnetworks-V4-ndk.so
 lib64/android.hardware.neuralnetworks@1.0.so
 lib64/android.hardware.neuralnetworks@1.1.so
 lib64/android.hardware.neuralnetworks@1.2.so
 lib64/android.hardware.neuralnetworks@1.3.so
 lib64/android.hardware.oemlock-V1-ndk.so
+lib64/android.hardware.power-V2-ndk.so
 lib64/android.hardware.power@1.0.so
 lib64/android.hardware.power@1.1.so
 lib64/android.hardware.power@1.2.so
@@ -1496,16 +1447,22 @@ lib64/android.hidl.token@1.0-utils.so
 lib64/android.hidl.token@1.0.so
 lib64/com.google.hardware.pixel.display-V4-ndk.so
 lib64/com.google.hardware.pixel.display-V9-ndk.so
+lib64/com.google.hardware.pixel.display-V15-ndk.so

 # Misc
 bin/dump/dump_gsc.sh
 lib/libbinder.so
+lib/libdmabufheap.so
 lib/libevent.so
+lib/libgralloctypes.so
 lib/libion.so
 lib/libprocessgroup.so
 lib/libui.so
+lib64/libdrm.so
 lib64/libevent.so
+lib64/libgralloctypes.so
 lib64/libion.so
+lib64/libui.so

 # Odex
 framework/oat/arm/com.google.android.camera.experimental2022.odex
@@ -1518,9 +1475,23 @@ framework/oat/arm64/com.google.android.camera.experimental2022.vdex
 # Edge TPU
 lib/libedgetpu_util.so

+# Flood control
+bin/flood.control.hal
+etc/init/init.flood.control.rc
+etc/vintf/manifest/flood_control.xml
+
 # Google
 etc/default-permissions/default-permissions_talkback.xml

+# QMI
+lib/libidl.so
+lib/libmdmdetect.so
+lib/libperipheral_client.so
+lib/libqmi_cci.so
+lib/libqmi_common_so.so
+lib/libqmi_encdec.so
+lib/libqmiservices.so
+
 # Secure element
 lib/android.hardware.secure_element.thales.libse.so
 lib/libstpreprocess21.so
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,107 +0,0 @@
-<manifest version="1.0" type="device" target-level="5">
-   <hal format="hidl">
-        <name>android.hardware.audio</name>
-        <transport>hwbinder</transport>
-        <version>7.0</version>
-        <interface>
-            <name>IDevicesFactory</name>
-            <instance>default</instance>
-        </interface>
-   </hal>
-   <hal format="hidl">
-        <name>android.hardware.audio.effect</name>
-        <transport>hwbinder</transport>
-        <version>7.0</version>
-        <interface>
-            <name>IEffectsFactory</name>
-            <instance>default</instance>
-        </interface>
-   </hal>
-   <hal format="hidl">
-        <name>android.hardware.soundtrigger</name>
-        <transport>hwbinder</transport>
-        <version>2.3</version>
-        <interface>
-            <name>ISoundTriggerHw</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.media.omx</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IOmx</name>
-            <instance>default</instance>
-        </interface>
-        <interface>
-            <name>IOmxStore</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.graphics.allocator</name>
-        <transport>hwbinder</transport>
-        <version>4.0</version>
-        <interface>
-            <name>IAllocator</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.graphics.composer</name>
-        <transport>hwbinder</transport>
-        <version>2.4</version>
-        <interface>
-            <name>IComposer</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.renderscript</name>
-        <transport arch="32+64">passthrough</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IDevice</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format = "hidl">
-        <name>android.hardware.dumpstate</name>
-        <transport>hwbinder</transport>
-        <version>1.1</version>
-        <interface>
-            <name>IDumpstateDevice</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.boot</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.2::IBootControl/default</fqname>
-    </hal>
-    <hal format="hidl">
-       <name>android.hardware.neuralnetworks</name>
-       <transport>hwbinder</transport>
-       <fqname>@1.3::IDevice/google-edgetpu</fqname>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.health</name>
-        <transport>hwbinder</transport>
-        <version>2.1</version>
-        <interface>
-            <name>IHealth</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-       <name>vendor.google.whitechapel.audio.audioext</name>
-       <transport>hwbinder</transport>
-       <version>4.0</version>
-       <interface>
-           <name>IAudioExt</name>
-           <instance>default</instance>
-       </interface>
-    </hal>
-    <kernel target-level="6"/>
-</manifest>
--- a/nfc/libnfc-hal-st-disable.conf
+++ b/nfc/libnfc-hal-st-disable.conf
@@ -1,152 +0,0 @@
-########################### Start of libnf-hal-st_aosp.conf ###########################
-
-###############################################################################
-###############################################################################
-# ST HAL trace log level
-STNFC_HAL_LOGLEVEL=4
-NFC_DEBUG_ENABLED=1
-
-###############################################################################
-# Vendor specific mode to enable FW (RF & SWP) traces.
-STNFC_FW_DEBUG_ENABLED=0
-
-###############################################################################
-# File used for NFA storage
-NFA_STORAGE="/data/nfc"
-
-###############################################################################
-# Dev Node used for ST HAL
-ST_NFC_DEV_NODE="/dev/st_no_such_device"
-
-###############################################################################
-# Keep the nfa storage file.
-PRESERVE_STORAGE=1
-
-###############################################################################
-# In Switch OFF mode (phone switched-off), specify the desired CE mode to
-# the controller.
-# 0: No card-emulation; DEFAULT
-# 1: Switch-off card-emulation enabled
-CE_ON_SWITCH_OFF_STATE=1
-
-###############################################################################
-# Vendor specific mode to support the USB charging mode if VPSIO=1 in switch off.
-STNFC_USB_CHARGING_MODE=1
-
-###############################################################################
-# Vendor Specific Proprietary Protocol & Discovery Configuration
-# Set to 0xFF if unsupported
-#  byte[0] NCI_PROTOCOL_18092_ACTIVE
-#  byte[1] NCI_PROTOCOL_B_PRIME
-#  byte[2] NCI_PROTOCOL_DUAL
-#  byte[3] NCI_PROTOCOL_15693
-#  byte[4] NCI_PROTOCOL_KOVIO
-#  byte[5] NCI_PROTOCOL_MIFARE
-#  byte[6] NCI_DISCOVERY_TYPE_POLL_KOVIO
-#  byte[7] NCI_DISCOVERY_TYPE_POLL_B_PRIME
-#  byte[8] NCI_DISCOVERY_TYPE_LISTEN_B_PRIME
-NFA_PROPRIETARY_CFG={05:FF:FF:06:8A:90:77:FF:FF}
-
-###############################################################################
-# Choose the presence-check algorithm for type-4 tag.  If not defined,
-# the default value is 1.
-# 0  NFA_RW_PRES_CHK_DEFAULT; Let stack selects an algorithm
-# 1  NFA_RW_PRES_CHK_I_BLOCK; ISO-DEP protocol's empty I-block
-# 2  NFA_RW_PRES_CHK_RESET; Deactivate to Sleep, then re-activate
-# 3  NFA_RW_PRES_CHK_RB_CH0; Type-4 tag protocol's ReadBinary command on channel 0
-# 4  NFA_RW_PRES_CHK_RB_CH3; Type-4 tag protocol's ReadBinary command on channel 3
-# 5  NFA_RW_PRES_CHK_ISO_DEP_NAK; presence check command ISO-DEP NAK as per NCI2.0
-PRESENCE_CHECK_ALGORITHM=5
-
-###############################################################################
-# Name of the NCI HAL module to use
-# If unset, falls back to nfc_nci.bcm2079x
-NCI_HAL_MODULE="nfc_nci.st21nfc"
-
-###############################################################################
-# White list to be set at startup.
-DEVICE_HOST_WHITE_LIST={02:C0}
-
-###############################################################################
-# BAIL OUT value for P2P
-# Implements algorithm for NFC-DEP protocol priority over ISO-DEP protocol.
-POLL_BAIL_OUT_MODE=1
-
-###############################################################################
-# Extended APDU length for ISO_DEP
-ISO_DEP_MAX_TRANSCEIVE=0xFEFF
-
-###############################################################################
-# Configure the NFC Extras to open and use a static pipe.  If the value is
-# not set or set to 0, then the default is use a dynamic pipe based on a
-# destination gate (see NFA_HCI_DEFAULT_DEST_GATE).  Note there is a value
-# for each EE (ESE/SIM)
-OFF_HOST_ESE_PIPE_ID=0x5E
-OFF_HOST_SIM_PIPE_ID=0x3E
-
-###############################################################################
-#Set the default Felica T3T System Code OffHost route Location :
-#This settings will be used when application does not set this parameter
-# host  0x00
-# eSE   0x82 (eSE),    0x86 (eUICC/SPI-SE)
-# UICC  0x81 (UICC_1), 0x85 (UICC_2)
-DEFAULT_SYS_CODE_ROUTE=0x86
-
-###############################################################################
-#Set the Felica T3T System Code supported power state:
-DEFAULT_SYS_CODE_PWR_STATE=0x3B
-
-###############################################################################
-# Path and Files used for FW update binaries storage
-STNFC_FW_PATH_STORAGE="/vendor/firmware"
-STNFC_FW_BIN_NAME="/st54j_fw.bin"
-STNFC_FW_CONF_NAME="/st54j_conf.bin"
-
-###############################################################################
-# Default off-host route for Felica.
-# This settings will be used when application does not set this parameter
-# host  0x00
-# eSE   0x82 (eSE),    0x86 (eUICC/SPI-SE)
-# UICC  0x81 (UICC_1), 0x85 (UICC_2)
-DEFAULT_NFCF_ROUTE=0x86
-
-###############################################################################
-# Configure the default off-host route.
-# used for technology A and B routing
-# eSE   0x82 (eSE),    0x86 (eUICC/SPI-SE)
-# UICC  0x81 (UICC_1), 0x85 (UICC_2)
-DEFAULT_OFFHOST_ROUTE=0x81
-
-###############################################################################
-# Configure the default AID route.
-# host  0x00
-# eSE   0x82 (eSE),    0x86 (eUICC/SPI-SE)
-# UICC  0x81 (UICC_1), 0x85 (UICC_2)
-DEFAULT_ROUTE=0x00
-
-###############################################################################
-# Configure the NFCEEIDs of offhost UICC.
-# UICC  0x81 (UICC_1), 0x85 (UICC_2)
-OFFHOST_ROUTE_UICC={81}
-
-###############################################################################
-# Configure the NFCEEIDs of offhost eSEs.
-# eSE   0x82 (eSE),    0x86 (eUICC/SPI-SE)
-OFFHOST_ROUTE_ESE={86}
-
-###############################################################################
-# Configure the list of NFCEE for the ISO-DEP routing.
-# host  0x00
-# eSE   0x82 (eSE),    0x86 (eUICC/SPI-SE)
-# UICC  0x81 (UICC_1), 0x85 (UICC_2)
-DEFAULT_ISODEP_ROUTE=0x81
-
-###############################################################################
-# Core configuration settings
-CORE_CONF_PROP={ 20, 02, 0a, 03,
-        a1, 01, 1e,
-        a2, 01, 19,
-        80, 01, 01
-}
-
-
--- a/nfc/libnfc-nci-cheetah.conf
+++ b/nfc/libnfc-nci-cheetah.conf
@@ -1,121 +0,0 @@
-###############################################################################
-# Application options
-NFC_DEBUG_ENABLED=0
-
-###############################################################################
-# File used for NFA storage
-NFA_STORAGE="/data/nfc"
-
-###############################################################################
-# Force UICC to only listen to the following technology(s).
-# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
-# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_B | NFA_TECHNOLOGY_MASK_F
-UICC_LISTEN_TECH_MASK=0x00
-
-###############################################################################
-# Set HOST default listen to the following technology(s).
-# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
-# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_F
-# 0x07 = A + B + F
-HOST_LISTEN_TECH_MASK=0x07
-
-###############################################################################
-# AID for Empty Select command
-# If specified, this AID will be substituted when an Empty SELECT command is
-# detected.  The first byte is the length of the AID.  Maximum length is 16.
-AID_FOR_EMPTY_SELECT={08:A0:00:00:01:51:00:00:00}
-
-###############################################################################
-# When screen is turned off, specify the desired power state of the controller.
-# 0: power-off-sleep state; DEFAULT
-# 1: full-power state
-# 2: screen-off card-emulation (CE4/CE3/CE1 modes are used)
-SCREEN_OFF_POWER_STATE=1
-
-###############################################################################
-# Force tag polling for the following technology(s).
-# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
-# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_B |
-#            NFA_TECHNOLOGY_MASK_F | NFA_TECHNOLOGY_MASK_ISO15693 |
-#            NFA_TECHNOLOGY_MASK_B_PRIME | NFA_TECHNOLOGY_MASK_KOVIO |
-#            NFA_TECHNOLOGY_MASK_ACTIVE
-#
-# Notable bits:
-# NFA_TECHNOLOGY_MASK_A             0x01    /* NFC Technology A             */
-# NFA_TECHNOLOGY_MASK_B             0x02    /* NFC Technology B             */
-# NFA_TECHNOLOGY_MASK_F             0x04    /* NFC Technology F             */
-# NFA_TECHNOLOGY_MASK_ISO15693      0x08    /* Proprietary Technology       */
-# NFA_TECHNOLOGY_MASK_KOVIO         0x20    /* Proprietary Technology       */
-# NFA_TECHNOLOGY_MASK_ACTIVE        0x40    /* NFC Technology Active        */
-POLLING_TECH_MASK=0x2F
-
-###############################################################################
-# Force P2P to only listen for the following technology(s).
-# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
-# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_F |
-# NFA_TECHNOLOGY_MASK_ACTIVE
-#
-# Notable bits:
-# NFA_TECHNOLOGY_MASK_A             0x01    /* NFC Technology A             */
-# NFA_TECHNOLOGY_MASK_F             0x04    /* NFC Technology F             */
-# NFA_TECHNOLOGY_MASK_ACTIVE         0x40    /* NFC Technology Active        */
-P2P_LISTEN_TECH_MASK=0x00
-
-PRESERVE_STORAGE=0x01
-
-###############################################################################
-# Override the stack default for NFA_EE_MAX_EE_SUPPORTED set in nfc_target.h.
-# The value is set to 3 by default as it assumes we will discover 0xF2,
-# 0xF3, and 0xF4. If a platform will exclude and SE, this value can be reduced
-# so that the stack will not wait any longer than necessary.
-# Maximum EE supported number
-# NXP PN547C2 0x02
-# NXP PN65T 0x03
-# NXP PN548C2 0x02
-# NXP PN66T 0x03
-NFA_MAX_EE_SUPPORTED=0x01
-
-###############################################################################
-# AID_MATCHING constants
-# AID_MATCHING_EXACT_ONLY 0x00
-# AID_MATCHING_EXACT_OR_PREFIX 0x01
-# AID_MATCHING_PREFIX_ONLY 0x02
-# AID_MATCHING_EXACT_OR_SUBSET_OR_PREFIX 0x03
-AID_MATCHING_MODE=0x03
-
-###############################################################################
-#Set the default Felica T3T System Code :
-#This settings will be used when application does not set this parameter
-DEFAULT_SYS_CODE={FE:FE}
-
-###############################################################################
-# Value of NIC parameter NFCC_COFNIG_CONTROL
-# 0x00  NFCC is not allowed to manage RF configuration
-# 0x01  NFCC is allowed to manage RF configuration
-NFCC_CONFIG_CONTROL=0x01
-
-###############################################################################
-#Set if the AID routing should be blocked for the power modes not supported.
-NFA_AID_BLOCK_ROUTE=1
-
-###############################################################################
-#Set the OffHost AID supported power state:
-OFFHOST_AID_ROUTE_PWR_STATE=0x3B
-
-###############################################################################
-# Mifare Tag implementation
-# 0: General implementation
-# 1: Legacy implementation
-LEGACY_MIFARE_READER=0
-
-###############################################################################
-# Nfc recovery implementation
-# 0: Crash Nfc Service
-# 1: Toggle Nfc state
-RECOVERY_OPTION=1
-
-###############################################################################
-# NFCEE Power Supply and Communication Link Control Configuration
-# Set when SetAlwaysOn enabled
-# Default 0x00 when SetAlways on disabled
-ALWAYS_ON_SET_EE_POWER_AND_LINK_CONF=0x03
--- a/nfc/libnfc-nci.conf
+++ b/nfc/libnfc-nci.conf
@@ -1,121 +0,0 @@
-###############################################################################
-# Application options
-NFC_DEBUG_ENABLED=0
-
-###############################################################################
-# File used for NFA storage
-NFA_STORAGE="/data/nfc"
-
-###############################################################################
-# Force UICC to only listen to the following technology(s).
-# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
-# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_B | NFA_TECHNOLOGY_MASK_F
-UICC_LISTEN_TECH_MASK=0x07
-
-###############################################################################
-# Set HOST default listen to the following technology(s).
-# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
-# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_F
-# 0x07 = A + B + F
-HOST_LISTEN_TECH_MASK=0x07
-
-###############################################################################
-# AID for Empty Select command
-# If specified, this AID will be substituted when an Empty SELECT command is
-# detected.  The first byte is the length of the AID.  Maximum length is 16.
-AID_FOR_EMPTY_SELECT={08:A0:00:00:01:51:00:00:00}
-
-###############################################################################
-# When screen is turned off, specify the desired power state of the controller.
-# 0: power-off-sleep state; DEFAULT
-# 1: full-power state
-# 2: screen-off card-emulation (CE4/CE3/CE1 modes are used)
-SCREEN_OFF_POWER_STATE=1
-
-###############################################################################
-# Force tag polling for the following technology(s).
-# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
-# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_B |
-#            NFA_TECHNOLOGY_MASK_F | NFA_TECHNOLOGY_MASK_ISO15693 |
-#            NFA_TECHNOLOGY_MASK_B_PRIME | NFA_TECHNOLOGY_MASK_KOVIO |
-#            NFA_TECHNOLOGY_MASK_ACTIVE
-#
-# Notable bits:
-# NFA_TECHNOLOGY_MASK_A             0x01    /* NFC Technology A             */
-# NFA_TECHNOLOGY_MASK_B             0x02    /* NFC Technology B             */
-# NFA_TECHNOLOGY_MASK_F             0x04    /* NFC Technology F             */
-# NFA_TECHNOLOGY_MASK_ISO15693      0x08    /* Proprietary Technology       */
-# NFA_TECHNOLOGY_MASK_KOVIO         0x20    /* Proprietary Technology       */
-# NFA_TECHNOLOGY_MASK_ACTIVE        0x40    /* NFC Technology Active        */
-POLLING_TECH_MASK=0x2F
-
-###############################################################################
-# Force P2P to only listen for the following technology(s).
-# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
-# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_F |
-# NFA_TECHNOLOGY_MASK_ACTIVE
-#
-# Notable bits:
-# NFA_TECHNOLOGY_MASK_A             0x01    /* NFC Technology A             */
-# NFA_TECHNOLOGY_MASK_F             0x04    /* NFC Technology F             */
-# NFA_TECHNOLOGY_MASK_ACTIVE         0x40    /* NFC Technology Active        */
-P2P_LISTEN_TECH_MASK=0x00
-
-PRESERVE_STORAGE=0x01
-
-###############################################################################
-# Override the stack default for NFA_EE_MAX_EE_SUPPORTED set in nfc_target.h.
-# The value is set to 3 by default as it assumes we will discover 0xF2,
-# 0xF3, and 0xF4. If a platform will exclude and SE, this value can be reduced
-# so that the stack will not wait any longer than necessary.
-# Maximum EE supported number
-# NXP PN547C2 0x02
-# NXP PN65T 0x03
-# NXP PN548C2 0x02
-# NXP PN66T 0x03
-NFA_MAX_EE_SUPPORTED=0x02
-
-###############################################################################
-# AID_MATCHING constants
-# AID_MATCHING_EXACT_ONLY 0x00
-# AID_MATCHING_EXACT_OR_PREFIX 0x01
-# AID_MATCHING_PREFIX_ONLY 0x02
-# AID_MATCHING_EXACT_OR_SUBSET_OR_PREFIX 0x03
-AID_MATCHING_MODE=0x03
-
-###############################################################################
-#Set the default Felica T3T System Code :
-#This settings will be used when application does not set this parameter
-DEFAULT_SYS_CODE={FE:FE}
-
-###############################################################################
-# Value of NIC parameter NFCC_COFNIG_CONTROL
-# 0x00  NFCC is not allowed to manage RF configuration
-# 0x01  NFCC is allowed to manage RF configuration
-NFCC_CONFIG_CONTROL=0x01
-
-###############################################################################
-#Set if the AID routing should be blocked for the power modes not supported.
-NFA_AID_BLOCK_ROUTE=1
-
-###############################################################################
-#Set the OffHost AID supported power state:
-OFFHOST_AID_ROUTE_PWR_STATE=0x3B
-
-###############################################################################
-# Mifare Tag implementation
-# 0: General implementation
-# 1: Legacy implementation
-LEGACY_MIFARE_READER=0
-
-###############################################################################
-# Nfc recovery implementation
-# 0: Crash Nfc Service
-# 1: Toggle Nfc state
-RECOVERY_OPTION=1
-
-###############################################################################
-# NFCEE Power Supply and Communication Link Control Configuration
-# Set when SetAlwaysOn enabled
-# Default 0x00 when SetAlways on disabled
-ALWAYS_ON_SET_EE_POWER_AND_LINK_CONF=0x03
--- a/powerhint.json
+++ b/powerhint.json
@@ -215,6 +215,54 @@
      ],
      "ResetOnInit": true
    },
+    {
+      "Name": "TAUclampMinOnNiceEnable",
+      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_enable",
+      "Values": [
+        "1",
+        "0"
+      ],
+      "ResetOnInit": true
+    },
+    {
+      "Name": "TAUclampMinOnNiceHighValue",
+      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_value",
+      "Values": [
+        "765",
+        "0"
+      ],
+      "ResetOnInit": true
+    },
+    {
+      "Name": "TAUclampMinOnNiceMidValue",
+      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_value",
+      "Values": [
+        "600",
+        "590",
+        "0"
+      ],
+      "ResetOnInit": true
+    },
+    {
+      "Name": "TAUclampMinOnNiceHighPrio",
+      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_prio",
+      "Values": [
+        "110",
+        "119",
+        "120"
+      ],
+      "ResetOnInit": true
+    },
+    {
+      "Name": "TAUclampMinOnNiceMidPrio",
+      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_prio",
+      "Values": [
+        "128",
+        "139",
+        "130"
+      ],
+      "ResetOnInit": true
+    },
    {
      "Name": "FGUClampBoost",
      "Path": "/proc/vendor_sched/groups/fg/uclamp_min",
@@ -307,6 +355,35 @@
      ],
      "ResetOnInit": true
    },
+    {
+      "Name": "TAAutoPreferFit",
+      "Path": "/proc/vendor_sched/groups/ta/auto_prefer_fit",
+      "Values": [
+        "1",
+        "0"
+      ],
+      "ResetOnInit": true
+    },
+    {
+      "Name": "TAPreferredIdleMaskMid",
+      "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_mid",
+      "Values": [
+        "0x3f",
+        "0xf0",
+        "0xff"
+      ],
+      "ResetOnInit": true
+    },
+    {
+      "Name": "TAPreferredIdleMaskLow",
+      "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_low",
+      "Values": [
+        "0x3f",
+        "0xf0",
+        "0xff"
+      ],
+      "ResetOnInit": true
+    },
    {
      "Name": "FGPreferIdle",
      "Path": "/proc/vendor_sched/groups/fg/prefer_idle",
@@ -335,14 +412,6 @@
      ],
      "ResetOnInit": true
    },
-    {
-      "Name": "NewlyIdleBalancer",
-      "Path": "/proc/vendor_sched/idle_balancer",
-      "Values": [
-        "0",
-        "1"
-      ]
-    },
    {
      "Name": "DisplayWakeup",
      "Path": "/sys/devices/platform/1c240000.drmdecon/early_wakeup",
@@ -662,6 +731,26 @@
      ],
      "DefaultIndex": 0,
      "ResetOnInit": true
+    },
+    {
+      "Name": "AAModeProperty",
+      "Path": "vendor.powerhal.mode.aa",
+      "Values": [
+        "1",
+        "0"
+      ],
+      "ResetOnInit": true,
+      "Type": "Property"
+    },
+    {
+      "Name": "SYSTEM_UI_ADPF_PROFILES",
+      "Path": "<AdpfConfig>:SYSTEM_UI",
+      "Values": [
+        "SYSTEM_UI_PROFILE"
+      ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true,
+      "Type": "Event"
    }
  ],
  "Actions": [
@@ -773,6 +862,54 @@
      "Duration": 5000,
      "Value": "0"
    },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "TAAutoPreferFit",
+      "Duration": 5000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "TAPreferredIdleMaskMid",
+      "Duration": 5000,
+      "Value": "0x3f"
+    },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "TAPreferredIdleMaskLow",
+      "Duration": 5000,
+      "Value": "0x3f"
+    },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "TAUclampMinOnNiceEnable",
+      "Duration": 5000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "TAUclampMinOnNiceHighValue",
+       "Duration": 5000,
+       "Value": "765"
+    },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "TAUclampMinOnNiceHighPrio",
+      "Duration": 5000,
+      "Value": "110"
+    },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "TAUclampMinOnNiceMidValue",
+       "Duration": 5000,
+       "Value": "590"
+    },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "TAUclampMinOnNiceMidPrio",
+      "Duration": 5000,
+      "Value": "139"
+    },
    {
      "PowerHint": "LAUNCH",
      "Type": "DoHint",
@@ -1216,12 +1353,6 @@
      "Duration": 0,
      "Value": "0"
    },
-    {
-      "PowerHint": "CAMERA_STREAMING_EXTREME",
-      "Node": "NewlyIdleBalancer",
-      "Duration": 0,
-      "Value": "0"
-    },
    {
      "PowerHint": "CAMERA_STREAMING_HIGH",
      "Node": "PMU_POLL",
@@ -1330,12 +1461,6 @@
      "Duration": 0,
      "Value": "0"
    },
-    {
-      "PowerHint": "CAMERA_STREAMING_HIGH",
-      "Node": "NewlyIdleBalancer",
-      "Duration": 0,
-      "Value": "0"
-    },
    {
      "PowerHint": "CAMERA_STREAMING_STANDARD",
      "Node": "PowerHALCameraRunning",
@@ -1390,12 +1515,6 @@
      "Duration": 0,
      "Value": "0"
    },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "NewlyIdleBalancer",
-      "Duration": 0,
-      "Value": "0"
-    },
    {
      "PowerHint": "CAMERA_STREAMING_LOW",
      "Node": "PowerHALCameraRunning",
@@ -1456,12 +1575,6 @@
      "Duration": 0,
      "Value": "0"
    },
-    {
-      "PowerHint": "CAMERA_STREAMING_LOW",
-      "Node": "NewlyIdleBalancer",
-      "Duration": 0,
-      "Value": "0"
-    },
    {
      "PowerHint": "CAMERA_VIDEO_RECORDING",
      "Type": "MaskHint",
@@ -1710,6 +1823,12 @@
      "Duration": 0,
      "Value": "1"
    },
+    {
+      "PowerHint": "AUTOMOTIVE_PROJECTION",
+      "Node": "AAModeProperty",
+      "Duration": 0,
+      "Value": "1"
+    },
    {
      "PowerHint": "DISPLAY_IDLE",
      "Node": "FGPreferIdle",
@@ -1727,6 +1846,18 @@
      "Type": "EndHint",
      "Value": "DISPLAY_UPDATE_IMMINENT"
    },
+    {
+      "PowerHint": "DISPLAY_IDLE",
+      "Type": "MaskHint",
+      "Value":"DISPLAY_UPDATE_IMMINENT",
+      "EnableProperty": "vendor.powerhal.mode.aa"
+    },
+    {
+      "PowerHint": "DISPLAY_IDLE",
+      "Type": "MaskHint",
+      "Value":"CPU_LOAD_RESET",
+      "EnableProperty": "vendor.powerhal.mode.aa"
+    },
    {
      "PowerHint": "DISPLAY_UPDATE_IMMINENT",
      "Node": "DisplayWakeup",
@@ -2072,76 +2203,40 @@
      "MaxRecordsNum": 300
    },
    {
-      "Name": "UiHighBoostWithoutPid",
-      "PID_On": false,
-      "PID_Po": 0,
-      "PID_Pu": 0,
-      "PID_I": 0,
-      "PID_I_Init": 0,
-      "PID_I_High": 0,
-      "PID_I_Low": 0,
-      "PID_Do": 0,
-      "PID_Du": 0,
-      "SamplingWindow_P": 1,
-      "SamplingWindow_I": 1,
-      "SamplingWindow_D": 1,
+      "Name": "SYSTEM_UI_PROFILE",
+      "PID_On": true,
+      "PID_Po": 2.0,
+      "PID_Pu": 1.0,
+      "PID_I": 0.0,
+      "PID_I_Init": 200,
+      "PID_I_High": 512,
+      "PID_I_Low": -30,
+      "PID_Do": 500.0,
+      "PID_Du": 0.0,
      "UclampMin_On": true,
-      "UclampMin_Init": 250,
-      "UclampMin_High": 197,
-      "UclampMin_Low": 197,
+      "UclampMin_Init": 232,
+      "UclampMin_LoadUp": 730,
+      "UclampMin_LoadReset": 730,
+      "UclampMin_High": 480,
+      "UclampMin_Low": 2,
      "UclampMax_EfficientBase": 500,
      "UclampMax_EfficientOffset": 200,
-      "ReportingRateLimitNs": 1,
-      "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 5.0
-    },
-    {
-      "Name": "UiLowBoostWithoutPid",
-      "PID_On": false,
-      "PID_Po": 0,
-      "PID_Pu": 0,
-      "PID_I": 0,
-      "PID_I_Init": 0,
-      "PID_I_High": 0,
-      "PID_I_Low": 0,
-      "PID_Do": 0,
-      "PID_Du": 0,
      "SamplingWindow_P": 1,
-      "SamplingWindow_I": 1,
+      "SamplingWindow_I": 0,
      "SamplingWindow_D": 1,
-      "UclampMin_On": true,
-      "UclampMin_Init": 250,
-      "UclampMin_High": 53,
-      "UclampMin_Low": 53,
-      "UclampMax_EfficientBase": 500,
-      "UclampMax_EfficientOffset": 200,
-      "ReportingRateLimitNs": 1,
+      "ReportingRateLimitNs": 166666660,
      "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 5.0
-    },
-    {
-      "Name": "UiLowNoneBoost",
-      "PID_On": false,
-      "PID_Po": 0,
-      "PID_Pu": 0,
-      "PID_I": 0,
-      "PID_I_Init": 0,
-      "PID_I_High": 0,
-      "PID_I_Low": 0,
-      "PID_Do": 0,
-      "PID_Du": 0,
-      "SamplingWindow_P": 1,
-      "SamplingWindow_I": 1,
-      "SamplingWindow_D": 1,
-      "UclampMin_On": true,
-      "UclampMin_Init": 250,
-      "UclampMin_High": 0,
-      "UclampMin_Low": 0,
-      "UclampMax_EfficientBase": 500,
-      "UclampMax_EfficientOffset": 200,
-      "ReportingRateLimitNs": 1,
-      "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 5.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
    }
  ]
 }
--- a/rro_overlays/NfcOverlay/OWNERS
+++ b/rro_overlays/NfcOverlay/OWNERS
@@ -1,2 +0,0 @@
-# Bug component: 48448
-include platform/packages/apps/Nfc:/OWNERS
--- a/rro_overlays/WifiOverlay/OWNERS
+++ b/rro_overlays/WifiOverlay/OWNERS
@@ -1,3 +0,0 @@
-# People who can approve changes for submission
-kumachang@google.com
-hsuvictor@google.com
--- a/self-extractors/METADATA
+++ b/self-extractors/METADATA
@@ -1,3 +0,0 @@
-third_party {
-  license_type: NOTICE
-}
--- a/self-extractors/PART1
+++ b/self-extractors/PART1
@@ -1,12 +0,0 @@
-#
-# Usage is subject to the enclosed license agreement
-
-echo
-echo The license for this software will now be displayed.
-echo You must agree to this license before using this software.
-echo
-echo -n Press Enter to view the license
-read dummy
-echo
-
-more << __EOF__
--- a/self-extractors/PART2
+++ b/self-extractors/PART2
@@ -1,22 +0,0 @@
-__EOF__
-
-if test $? != 0
-then
-  echo ERROR: Couldn\'t display license file 1>&2
-  exit 1
-fi
-
-echo
-
-echo -n Type \"I ACCEPT\" if you agree to the terms of the license:\ 
-read typed
-
-if test "$typed" != I\ ACCEPT
-then
-  echo
-  echo You didn\'t accept the license. Extraction aborted.
-  exit 2
-fi
-
-echo
-
--- a/self-extractors/PART3
+++ b/self-extractors/PART3
@@ -1,12 +0,0 @@
-
-if test $? != 0
-then
-  echo
-  echo ERROR: Couldn\'t extract files. 1>&2
-  exit 3
-else
-  echo
-  echo Files extracted successfully.
-fi
-exit 0
-
--- a/self-extractors/PROLOGUE
+++ b/self-extractors/PROLOGUE
@@ -1,2 +0,0 @@
-#!/bin/bash
-#
--- a/self-extractors/extract-lists.txt
+++ b/self-extractors/extract-lists.txt
@@ -1,15 +0,0 @@
-  google_devices)
-    TO_EXTRACT="\
-            IMAGES/vbmeta_vendor.img \
-            IMAGES/vendor.img \
-            IMAGES/vendor_dlkm.img \
-            RADIO/bootloader.img \
-            RADIO/radio.img \
-            system_ext/etc/permissions/com.shannon.imsservice.xml \
-            system_ext/etc/permissions/com.shannon.rcsservice.xml \
-            system_ext/lib64/libmediaadaptor.so \
-            system_ext/priv-app/ShannonRcs/ShannonRcs.apk \
-            system_ext/priv-app/ShannonIms/ShannonIms.apk \
-            "
-    ;;
-
--- a/self-extractors/google_devices/COPYRIGHT
+++ b/self-extractors/google_devices/COPYRIGHT
@@ -1 +0,0 @@
-# (C) Google Inc.
--- a/self-extractors/google_devices/LICENSE
+++ b/self-extractors/google_devices/LICENSE
@@ -1,264 +0,0 @@
-THIS DEVELOPER SOFTWARE LICENSE AGREEMENT (THE "AGREEMENT") IS A LEGALLY
-BINDING AGREEMENT BETWEEN Google Inc. ("LICENSOR") AND
-YOU OR THE LEGAL ENTITY YOU REPRESENT ("You" or its possessive, "Your"). BY
-TYPING "I ACCEPT" WHERE INDICATED YOU ACKNOWLEDGE THAT YOU HAVE READ THIS
-AGREEMENT, UNDERSTAND IT AND AGREE TO BE BOUND BY ITS TERMS AND CONDITIONS.
-IF YOU DO NOT AGREE TO THESE TERMS YOU MUST DISCONTINUE THE INSTALLATION
-PROCESS AND YOU SHALL NOT USE THE SOFTWARE OR RETAIN ANY COPIES OF THE
-SOFTWARE OR DOCUMENTATION. ANY USE OR POSSESSION OF THE SOFTWARE BY YOU IS
-SUBJECT TO THE TERMS AND CONDITIONS SET FORTH IN THIS AGREEMENT. IF THE
-SOFTWARE IS INSTALLED ON A COMPUTER OWNED BY A CORPORATION OR OTHER LEGAL
-ENTITY, THEN YOU REPRESENT AND WARRANT THAT YOU HAVE THE AUTHORITY TO BIND
-SUCH ENTITY TO THE TERMS AND CONDITIONS OF THIS AGREEMENT.
-
-   1.  Special Definitions
-
-      a.  The term "Android" means the open source mobile platform, software
-          stack, operating system, middleware, application programming
-          interfaces and mobile applications under the trade-name "Android"
-          distributed at Android.com.
-
-      b.  The term "Android Applications" means a software application or
-          open-source contribution developed by You, designed to operate with
-          Android that does not contain or incorporate any of the Software.
-
-      c.  The term "Authorized Android Enabled Device" means only the device
-          identified on the site from which You downloaded the Software.
-          The term "Software" means the Licensor's proprietary software and
-          libraries in object code form, designed for use on the Authorized
-          Android Enabled Device.
-
-      d.  The term "Authorized Android Enabled Device Software" means a
-          packaged build for Authorized Android Enabled Devices, consisting
-          of files suitable for installation on an Authorized Android Enabled
-          Device using a mechanism such as fastboot mode or recovery mode.
-
-   2.  License Grant
-
-      a.  Subject to the terms of this Agreement, Licensor hereby grants to
-          You, free of charge, a non-exclusive, non-sublicensable,
-          non-transferable, limited copyright license, during the term of
-          this Agreement, to download, install and use the Software
-          internally in machine-readable (i.e., object code) form and the
-          Documentation for non-commercial use on an Authorized Android
-          Enabled Device and non-commercial redistribution for academic
-          purposes only of a reasonable number of copies of the Authorized
-          Android Enabled Device Software (the "Limited Purpose"). You may
-          grant your end users the right to use the Software for
-          non-commercial purposes on an Authorized Android Enabled Device.
-          The license to the Software granted to You hereunder is solely for
-          the Limited Purpose set forth in this section, and the Software
-          shall not be used for any other purpose.
-
-   3.  Restrictions
-
-      a.  Retention of Rights. The entire right, title and interest in the
-          Software shall remain with Licensor and, unless specified in
-          writing hereunder, no rights are granted to any of the Software.
-          Except for the right to use the Software for the Limited Purpose,
-          the delivery of the Software to You does not convey to You any
-          intellectual property rights in the Software, including, but not
-          limited to any rights under any patent, trademark, copyright, or
-          trade secret. Neither the delivery of the Software to You nor any
-          terms set forth herein shall be construed to grant to You, either
-          expressly, by implication or by way of estoppel, any license under
-          any patents or other intellectual property rights covering or
-          relating to any other product or invention or any combination of
-          the Software with any other product. Any rights not expressly
-          granted to You herein are reserved by Licensor.
-
-      b.  No Commercialization or Distribution of the Software and
-          Documentation. Except as expressly provided in Section 2 of this
-          Agreement, You shall have no right to (i) copy, disclose,
-          distribute, publically perform, publically display, transfer,
-          alter, modify, translate, disassemble, decompile, reverse engineer,
-          or adapt the Software and Documentation, or any portion thereof, or
-          create any derivative works based thereon; (ii) rent, lease,
-          assign, sublicense, resell, disclose or otherwise transfer the
-          Software and Documentation in whole or in part to any third party
-          (iii) use the Software and Documentation except for the Limited
-          Purpose, (iv) remove or alter any of the copyright or proprietary
-          notices contained in any of the Software and Documentation. For the
-          purposes of clarity, nothing in this Agreement prohibits You from
-          making and distributing Android Applications under commercial or
-          non-commercial terms, provided that You shall not contain,
-          incorporate, and/or compile the Software or any of its derivative
-          works, in whole or in part, into Your Android Applications and/or
-          any software/devices created by You or by third parties acting on
-          Your behalf. You and any such third party shall comply with all of
-          the terms and conditions of this Agreement.
-
-      c.  No Reverse Engineering. Except for any portions of the Software
-          provided to You in source code format and except for any third
-          party code distributed with the Software that is licensed under
-          contrary terms, You will not reverse engineer, disassemble,
-          decompile, or translate the Software, or otherwise attempt to
-          derive the source code version of the Software, except if and to
-          the extent expressly permitted under any applicable law.
-
-      d.  Third Party Software. You agree that Android may contain third
-          party software. You agree that you may not distribute such third
-          party software for any purpose without appropriate licenses from
-          the applicable third party or parties.
-
-      e.  No Transfer or Assignment. You shall not assign any of its rights
-          or obligations under this Agreement. Any attempted assignment in
-          contravention of this Section shall be void.
-
-      f.  Licensor shall retain all title, ownership and Intellectual
-          Property Rights in and to the Software and any derivative thereof.
-          "Intellectual Property Rights" shall mean all patent, copyright,
-          trade secret, trademark and other proprietary and intellectual
-          property rights, including moral rights.
-
-      g.  Neither this Agreement, nor any act by Licensor or its Affiliates
-          persuant to this Agreement or relating to the Software (including,
-          without limitation, the provision by Licensor or its Affiliates of
-          the Software) shall provide to You any license or any other rights
-          whatsoever under any patents, trademarks, trade secrets, copyrights
-          or any other intellectual property rights of Licensor or its
-          Affiliates, except for the copyrights expressly set forth in this
-          Agreement. You understand and agree that:
-
-      h.  Neither this Agreement, nor delivery of the Software alone or in
-          combination with any Licensor ASIC grants you any right to
-          practice, or any other right at all with respect to, any patent of
-          Licensor or its Affiliates, and
-
-      i.  A separating license agreement from Motorola Incorporated is needed
-          to use or practice any patent of Licensor or its Affiliates.
-
-      j.  You agree not to contend in any context that, as a result of the
-          provision or use of this software, either Licensor or Affiliate has
-          any obligation to extend, or Licensor or any other party has
-          obtained any right to, any license, whether express or implied,
-          with respect to any patent of Licensor or its Affiliates for any
-          purpose. For the purposes of this agreement, "Affiliate" means
-          (i) any corporation or any other legal entity that owns, directly
-          or indirectly, more than fifty percent (50%) of the shares, equity
-          interest or other securities of any entity entitled to vote for
-          election of directors (or other managing authority), or (ii) any
-          corporation or any other legal entity fifty percent (50%) or more
-          of whose shares, equity interest, or other securities entitled to
-          vote for election of directors (or other managing authority) is
-          owned or controlled by an entity, either directly or indirectly.
-
-   4.  Indemnity
-
-      a.  You agree to indemnify and hold harmless Licensor, Google, and
-          their officers, directors, customers, employees and successors and
-          assigns (each an "Indemnified Party") against any and all claims,
-          demands, causes of action, losses, liabilities, damages, costs and
-          expenses, incurred by the Indemnified Party (including but not
-          limited to costs of defense, investigation and reasonable
-          attorney's fees) arising out of, resulting from or related to
-          (i) any software, products, documentation, content, materials or
-          derivative works created or developed by You using the Software
-          which causes an infringement of any patent, copyright, trademark,
-          trade secret, or other property, publicity or privacy rights of any
-          third parties arising in any jurisdiction anywhere in the world,
-          (ii) the download, distribution, installation, storage, execution,
-          use or transfer of such software, products, documentation, content,
-          materials or derivative works by any person or entity, and/or
-          (iii) any breach of this Agreement by You. If requested by an
-          Indemnified Party, You agree to defend such Indemnified Party in
-          connection with any third party claims, demands, or causes of
-          action resulting from, arising out of or in connection with any of
-          the foregoing.
-
-   5.  Limitation of Liability
-
-      a.  TO THE MAXIMUM EXTENT PERMITTED UNDER APPLICABLE LAWS, UNDER NO
-          CIRCUMSTANCES, INCLUDING WITHOUT LIMITATION NEGLIGENCE, SHALL
-          LICENSOR, GOOGLE, THEIR AFFILIATES AND/OR ITS DIRECTORS, OFFICERS,
-          EMPLOYEES OR AGENTS BE LIABLE FOR ANY INDIRECT, INCIDENTAL,
-          SPECIAL, PUNITIVE OR CONSEQUENTIAL DAMAGES (INCLUDING BUT NOT
-          LIMITED TO DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS
-          INTERRUPTION, LOSS OF BUSINESS INFORMATION AND THE LIKE) ARISING
-          OUT OF OR IN CONNECTION WITH THE SOFTWARE OR ANY DOWNLOAD,
-          INSTALLATION OR USE OF, OR INABILITY TO USE, THE SOFTWARE, EVEN IF
-          LICENSOR OR GOOGLE HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH
-          DAMAGES. SOME JURISDICTIONS DO NOT ALLOW THE LIMITATION OR
-          EXCLUSION OF LIABILITY FOR INCIDENTAL OR CONSEQUENTIAL DAMAGES SO
-          THE ABOVE LIMITATION OR EXCLUSION MAY NOT APPLY OR MAY BE LIMITED.
-          IN NO EVENT SHALL LICENSOR'S OR GOOGLE'S TOTAL AGGREGATE LIABILITY
-          TO YOU FOR ANY AND ALL DAMAGES, LOSSES, CLAIMS AND CAUSES OF
-          ACTIONS (WHETHER IN CONTRACT, TORT, INCLUDING NEGLIGENCE,
-          INDEMNIFICATION OR OTHERWISE) EXCEED ONE HUNDRED U.S. DOLLARS
-          (US$100). THE LIMITATIONS SET FORTH IN THIS PARAGRAPH SHALL BE
-          DEEMED TO APPLY TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW.
-          THE PARTIES HAVE FULLY CONSIDERED THE FOREGOING ALLOCATION OF RISK
-          AND FIND IT REASONABLE, AND THAT THE FOREGOING LIMITATIONS IN THIS
-          PARAGRAPH ARE AN ESSENTIAL BASIS OF THE BARGAIN BETWEEN THE
-          PARTIES.
-
-   6.  No Warranty
-
-      a.  LICENSOR AND GOOGLE MAKE NO WARRANTIES, EXPRESS OR IMPLIED, WITH
-          RESPECT TO THE SOFTWARE AND DOCUMENTATION PROVIDED UNDER THIS
-          AGREEMENT, INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF
-          MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE OR AGAINST
-          INFRINGEMENT, OR ANY EXPRESS OR IMPLIED WARRANTY ARISING OUT OF
-          TRADE USAGE OR OUT OF A COURSE OF DEALING OR COURSE OF PERFORMANCE.
-          NOTHING CONTAINED IN THIS AGREEMENT SHALL BE CONSTRUED AS A
-          WARRANTY OR REPRESENTATION BY LICENSOR (I) AS TO THE VALIDITY OR
-          SCOPE OF ANY PATENT, COPYRIGHT OR OTHER INTELLECTUAL PROPERTY RIGHT
-          AND (II) THAT ANY MANUFACTURE OR USE WILL BE FREE FROM INFRINGEMENT
-          OF PATENTS, COPYRIGHTS OR OTHER INTELLECTUAL PROPERTY RIGHTS OF
-          OTHERS, AND IT SHALL BE THE SOLE RESPONSIBILITY OF YOU TO MAKE SUCH
-          DETERMINATION AS IS NECESSARY WITH RESPECT TO THE ACQUISITION OF
-          LICENSES UNDER PATENTS AND OTHER INTELLECTUAL PROPERTY OF THIRD
-          PARTIES. LICENSOR AND GOOGLE SHALL NOT HAVE ANY OBLIGATION TO
-          PROVIDE ANY TECHNICAL SUPPORT OF THE SOFTWARE UNDER THIS AGREEMENT.
-
-   7.  Term and Termination
-
-      a.  This Agreement shall be effective on the date You accept this
-          Agreement and shall remain in effect until terminated as provided
-          herein. You may terminate the Agreement at any time by deleting and
-          destroying all copies of the Software and all related information
-          in Your possession or control. This Agreement terminates
-          immediately and automatically, with or without notice, if You fail
-          to comply with any provision hereof. Additionally, Licensor may at
-          any time terminate this Agreement, without cause, upon notice to
-          You. Upon termination You must delete or destroy all copies of the
-          Software in Your possession, and the license granted to You in this
-          Agreement shall terminate. Sections 3, 4, 5, 6 and 8 shall survive
-          the termination of this Agreement.
-
-   8.  Miscellaneous
-
-      a.  Governing Law. This Agreement is governed and interpreted in
-          accordance with the laws of the State of California without giving
-          effect to its conflict of laws provisions. The United Nations
-          Convention on Contracts for the International Sale of Goods is
-          expressly disclaimed and shall not apply. Any claim arising out of
-          or related to this Agreement must be brought exclusively in a
-          federal or state court located in Santa Clara County, California
-          and You consent to the jurisdiction and venue of such courts.
-
-      b.  Waiver and Severability. The failure of either party to require
-          performance by the other party of any provision of this Agreement
-          shall not affect the full right to require such performance at any
-          time thereafter; nor shall the waiver by either party of a breach
-          of any provision of this Agreement be taken or held to be a waiver
-          of the provision itself. Severability. If any provision of this
-          Agreement is unenforceable or invalid under any applicable law or
-          is so held by applicable court decision, such unenforceability or
-          invalidity shall not render this Agreement unenforceable or invalid
-          as a whole, and such provision shall be changed and interpreted so
-          as to best accomplish the objectives of such unenforceable or
-          invalid provision within the limits of applicable law or
-          applicable court decisions.
-
-      c.  Amendment and Modification. This Agreement and any of its terms and
-          provisions may only be amended, modified, supplemented or waived in
-          a writing signed by both parties hereto.
-
-      d.  Compliance with Laws. You shall comply with all applicable laws,
-          rules, and regulations in connection with its activities under this
-          Agreement.
-
-      e.  Entire Agreement. This Agreement completely and exclusively states
-          the agreement between You and Licensor regarding this subject
-          matter.
--- a/self-extractors/google_devices/staging/Android.bp.txt
+++ b/self-extractors/google_devices/staging/Android.bp.txt
@@ -1,41 +0,0 @@
-// Copyright (C) 2023 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.
-
-soong_namespace {
-}
-
-cc_prebuilt_library_shared {
-    name: "libmediaadaptor",
-    arch: {
-        arm64: {
-            srcs: ["lib64/libmediaadaptor.so"],
-            shared_libs: [
-                "libandroid_runtime",
-                "libbinder",
-                "libc++",
-                "liblog",
-                "libmedia",
-                "libnativehelper",
-                "libstagefright",
-                "libutils",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    system_ext_specific: true,
-    strip: {
-        none: true,
-    },
-}
-
--- a/self-extractors/google_devices/staging/Android.mk.template
+++ b/self-extractors/google_devices/staging/Android.mk.template
@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2023 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-ifneq ($(filter lynx,$(TARGET_DEVICE)),)
-  $(call add-radio-file,bootloader.img)
-  $(call add-radio-file,radio.img)
-endif
-
-ifneq ($(filter lynx,$(TARGET_DEVICE)),)
-include $(CLEAR_VARS)
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_MODULE := ShannonIms
-LOCAL_MODULE_TAGS := optional
-LOCAL_BUILT_MODULE_STEM := package.apk
-LOCAL_SYSTEM_EXT_MODULE := true
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_MODULE_OWNER := samsung
-LOCAL_MODULE_CLASS := APPS
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_CERTIFICATE := platform
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_MODULE := ShannonRcs
-LOCAL_MODULE_TAGS := optional
-LOCAL_BUILT_MODULE_STEM := package.apk
-LOCAL_SYSTEM_EXT_MODULE := true
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_MODULE_OWNER := samsung
-LOCAL_MODULE_CLASS := APPS
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
-include $(BUILD_PREBUILT)
-
-endif
--- a/self-extractors/google_devices/staging/BoardConfigPartial.mk
+++ b/self-extractors/google_devices/staging/BoardConfigPartial.mk
@@ -1,37 +0,0 @@
-# Copyright 2023 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.
-
-BOARD_PREBUILT_VENDORIMAGE := vendor/google_devices/lynx/proprietary/vendor.img
-
-BOARD_PREBUILT_VENDOR_DLKMIMAGE := vendor/google_devices/lynx/proprietary/vendor_dlkm.img
-
-TARGET_COPY_OUT_VENDOR_DLKM := vendor_dlkm
-
-BOARD_AVB_VBMETA_VENDOR := vendor
-BOARD_AVB_VBMETA_VENDOR_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
-BOARD_AVB_VBMETA_VENDOR_ALGORITHM := SHA256_RSA2048
-BOARD_AVB_VBMETA_VENDOR_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
-BOARD_AVB_VBMETA_VENDOR_ROLLBACK_INDEX_LOCATION := 3
-
-AB_OTA_PARTITIONS += \
-    vbmeta_vendor \
-    vendor \
-    vendor_dlkm \
-
-include vendor/google/tools/android-info.mk
-ifdef USE_ANDROID_INFO
-  TARGET_BOARD_INFO_FILE := vendor/google_devices/lynx/android-info.txt
-endif
-
-VENDOR_BLOBS_LICENSE := vendor/google_devices/lynx/LICENSE
--- a/self-extractors/google_devices/staging/device-partial.mk
+++ b/self-extractors/google_devices/staging/device-partial.mk
@@ -1,30 +0,0 @@
-# Copyright 2023 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.
-
-PRODUCT_SOONG_NAMESPACES += \
-    vendor/google_devices/lynx/proprietary \
-
-# AOSP packages required by the blobs
-PRODUCT_PACKAGES := \
-    ShannonIms \
-    ShannonRcs \
-
-PRODUCT_PACKAGES += \
-    libmediaadaptor \
-
-#  blob(s) necessary for lynx hardware
-PRODUCT_COPY_FILES := \
-    vendor/google_devices/lynx/proprietary/com.shannon.imsservice.xml:system_ext/etc/permissions/com.shannon.imsservice.xml:samsung \
-    vendor/google_devices/lynx/proprietary/com.shannon.rcsservice.xml:system_ext/etc/permissions/com.shannon.rcsservice.xml:samsung \
-
--- a/self-extractors/root/android-info.txt
+++ b/self-extractors/root/android-info.txt
@@ -1,8 +0,0 @@
-require board=lynx
-require partition-exists=vendor_kernel_boot
-
-require version-bootloader=lynx-1.0-9450676
-
-
-
-require version-baseband=g5300n-221222-221226-B-9437664
--- a/self-extractors/root/proprietary/BoardConfigVendor.mk
+++ b/self-extractors/root/proprietary/BoardConfigVendor.mk
@@ -1,15 +0,0 @@
-# Copyright 2023 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.
-
-include vendor/google_devices/lynx/BoardConfigPartial.mk
--- a/self-extractors/root/proprietary/device-vendor.mk
+++ b/self-extractors/root/proprietary/device-vendor.mk
@@ -1,15 +0,0 @@
-# Copyright 2023 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-if-exists, vendor/google_devices/lynx/device-partial.mk)
Author	SHA1	Message	Date
AnierinB	213c55ed51	lynx: Initialize for Evolution X 11.x Signed-off-by: AnierinB <anierin@evolution-x.org>	2025-09-26 04:54:41 +00:00
LuK1337	c630d31a8e	lynx: We don't support udfps touch handler This commit fixes broken UDFPS on gs101/gs201/zuma. The breakage is a combination of two changes: The A16 UDFPS HAL fallback switching from false to true, and the introduction of `topic:fingerprint-halHandlesDisplayTouches`. When HAL sets halHandlesDisplayTouches to true, its onPointerDown() / onPointerUp() methods won't be called, which in this case will simply break it. This went unnoticed on Android 15 because the HAL defaulted to false and the fps_touch_handler_supported property was not set. Change-Id: If24475b5f14b7f02b90774be6acf20865285f1ab Signed-off-by: AnierinB <anierin@evolution-x.org>	2025-08-28 21:09:13 +00:00
Michael Bestas	0c93c1d18f	lynx: Drop prebuilt kernel dependency Change-Id: I594f5963b1ad51f529b5e1562fa36f8d4f22a553	2025-08-28 16:16:16 +03:00
Michael Bestas	855e8514fd	Update fingerprint/build description from BP2A.250805.005 Change-Id: If49fe065558bd2d6375c2806db5841e3c2bb7dbe	2025-08-13 02:22:25 +00:00
Michael Bestas	72702d48d3	Update fingerprint/build description from BP2A.250705.008 Change-Id: Iea1208791bd34355aac6006ea94dbdc05a4fa11e	2025-07-09 16:02:42 +03:00
Michael Bestas	c17e0724d8	lynx: Include additional wlan soong namespace Change-Id: I1614960d2ca7a15f1646185986e2eae055e4b51d	2025-07-06 12:59:16 +03:00
Michael Bestas	8bdec3db96	lynx: Drop flood control HAL We are missing the sepolicy for it and it's disabled Change-Id: I22f2055e74ecfd3115cd035e685245ca0d6202e2	2025-06-26 10:19:15 +03:00
Michael Bestas	1fc5312b16	lynx: Remove non-existent vendor includes Change-Id: I1bc76430d30259984f4eb91907be61ef39646c27	2025-06-26 10:19:15 +03:00
Michael Bestas	333e2441b7	lynx: Remove userdebug/eng configuration Change-Id: I3739e6e099681c667c80723f0f6e3197923ff762	2025-06-26 10:19:15 +03:00
Michael Bestas	fa55734a39	lynx: Remove factory scripts & self-extractors Change-Id: I64f34481d9d3a41f5c01b5a9a3cd27db2cd10866	2025-06-26 10:19:14 +03:00
Michael Bestas	f406f92da4	lynx: Remove all boards except lynx Change-Id: Ib34dd38d55f39e9a61c0f61d9c659e07494177a1	2025-06-26 10:19:14 +03:00
Michael Bestas	ec02c5aac3	lynx: Remove AOSP gerrit configuration Change-Id: I3bf3987b08a710ddf278cae5243946fae70fce6a	2025-06-26 10:19:14 +03:00
Michael Bestas	0f1c4fd59a	Update fingerprint/build description from BP2A.250605.031.A2 Change-Id: I67068778abe46a0f72e1bdd0ee8aeac14969f58b	2025-06-26 10:19:14 +03:00
Michael Bestas	e79333d08f	lynx: Update powerhint.json from BP2A Change-Id: I3aa8cb97c1bc2fdbedb6783a11b99e6c759caa41	2025-06-23 22:03:28 +03:00
Michael Bestas	eff9bd4396	lynx: Update gps configuration from BP2A Change-Id: If17af64c96227a9655a0e6e287cc311bd62b4c4f	2025-06-23 22:03:23 +03:00
Michael Bestas	12f2a23684	lynx: Update proprietary files setup for 16 Change-Id: I915a8192f5694d03ddbd2a6d4c6ea5033669500a	2025-06-23 22:02:28 +03:00
Michael Bestas	29141871b0	Merge tag 'aml_tz6_351400020' into staging/lineage-23.0_merge-aml_tz6_351400020 aml_tz6_351400020 (13155446,com.google.android.go.tzdata6,com.google.android.tzdata6) # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ9i73wAKCRDorT+BmrEO # eEqyAJ9Kmfr0cNp1qDtoU4iFZ8YB4C52MQCfUCgDuwG23mbyi2dCdLv3bIRLVc0= # =vcHV # -----END PGP SIGNATURE----- # gpg: Signature made Tue Mar 18 02:18:39 2025 EET # gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78 # gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate] # By guibing (2) and others # Via Android Build Coastguard Worker (9) and others * tag 'aml_tz6_351400020': Remove old unused VINTF manifest file ADPF:lynx: use tagged ADPF profile for SYSTEM_UI. ADPF:lynx: remove unused adpf profiles. powerhint: Mask hints in AA and DISPLAY_IDLE Add a soong config variable "USES_DEVICE_GOOGLE_LYNX" for prebuilt wlan remove unused hint Vibrator: Add permissions for owt_lib_compat Change-Id: I0af62d6cb753cfd4d555574f5e61c83ba5a33370	2025-06-23 05:20:28 +03:00
Android Build Coastguard Worker	3a40707759	Snap for 13025264 from `f21ec8bdd8` to mainline-tzdata6-release Change-Id: I7c36d4c10cbd2090c7529653623022bbc2abcb8a	2025-02-06 14:21:12 -08:00
Devin Moore	f21ec8bdd8	Remove old unused VINTF manifest file am: `acec26c709` am: `859a6868cd` Original change: https://android-review.googlesource.com/c/device/google/lynx/+/3478218 Change-Id: Ic453be887c790b508f5787a0ca7d20c9a3f85bdd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>	2025-02-06 03:31:08 -08:00
Devin Moore	859a6868cd	Remove old unused VINTF manifest file am: `acec26c709` Original change: https://android-review.googlesource.com/c/device/google/lynx/+/3478218 Change-Id: I2e52b83e134c6e29e0db68b60a6c6a760dac393d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>	2025-02-06 03:05:00 -08:00
Devin Moore	acec26c709	Remove old unused VINTF manifest file This file is out of date and unused, so remove it. It's targeting Android R FCM and declaring old HIDL versions of HALs that these devices do not use. Test: m Bug: 388074589 Change-Id: I8e53bfc3171de8afcedc6adc678d5f29c826a1bb	2025-02-05 21:42:15 +00:00
guibing	49d83d292f	ADPF:lynx: use tagged ADPF profile for SYSTEM_UI. - Add a event node for SYSTEM_UI; - Add a separate SYSTEM_UI profile. Bug: 393196667 Test: adb shell dumpsys android.hardware.power.IPower/default Flag: NONE powerhal doesn't have a flag yet Change-Id: I763e2a7c715ce537e0eaa778e142fd3614b49505	2025-02-03 19:37:30 +00:00
guibing	d7d636190b	ADPF:lynx: remove unused adpf profiles. Bug: 393196667 Test: adb shell dumpsys android.hardware.power.IPower/default Flag: NONE powerhal doesn't have a flag yet Change-Id: I5f3957af34720499191331bf6bdc31819864fbf0	2025-02-03 19:35:43 +00:00
Paulsu Su	c98ea56c0a	powerhint: Mask hints in AA and DISPLAY_IDLE This CL adds a powerhint for AA mode to mask storming hint. DISPLAY_IDLE masks DISPLAY_UPDATE_IMMINENT and CPU_LOAD_RESET when Android Auto property is set. When navigation in Android Auto, the two hint with action to boost memlat is costly. Bug: 380188115 Change-Id: I825a56ac32a0ecdc8b441af9cb64e81b1d04f9a6 Test: Local test with desktop_head_unit_internal Flag: EXEMPT powerhint change	2025-01-15 00:46:11 -08:00
kellyhung	c206d40f87	Add a soong config variable "USES_DEVICE_GOOGLE_LYNX" for prebuilt wlan Flag: EXEMPT bugfix Bug: 387923588 Test: Presubmits Change-Id: I53991fc016b53c1e366e4fdf010f0ac2a7499836	2025-01-13 06:42:07 +00:00
Android Build Coastguard Worker	073ca6a6e8	Snap for 12872597 from `38fc365a68` to mainline-tzdata6-release Change-Id: Ia746d6e1599de41c26a0c301d54d4efa6af53b72	2025-01-06 04:35:25 -08:00
Chungkai Mei	38fc365a68	remove unused hint As we already migrated kernel to 6.1, NewlyIdleBalancer is not used anymore. Flag: NONE just remove unused hint Bug: 379810138 Change-Id: I320983d36c2cc8edae99e5c132ca63f4d2237046 Signed-off-by: Chungkai Mei <chungkai@google.com>	2024-12-17 02:09:20 -08:00
Xin Li	85b3a71025	[automerger skipped] Merge 24Q4 into AOSP main am: `3560d785f9` -s ours am: `c841358352` -s ours am skip reason: Merged-In I24ba47dafb991c395fa27ba7585c907e7b9f1920 with SHA-1 `f495da19f7` is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/29693684 Change-Id: I70f281340d081dde0763753c4cbf4905e7dfcc7f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>	2024-12-13 21:55:47 -08:00
Xin Li	c841358352	[automerger skipped] Merge 24Q4 into AOSP main am: `3560d785f9` -s ours am skip reason: Merged-In I24ba47dafb991c395fa27ba7585c907e7b9f1920 with SHA-1 `f495da19f7` is already in history Original change: https://android-review.googlesource.com/c/device/google/lynx/+/3413722 Change-Id: I06021130d64bde1a862ad998f88061fdf0e8a981 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>	2024-12-13 19:14:33 -08:00
Xin Li	3560d785f9	Merge 24Q4 into AOSP main Bug: 370570306 Merged-In: I24ba47dafb991c395fa27ba7585c907e7b9f1920 Change-Id: Ibfe0bea72a7e42ebf8550ea0e934214dc665ee68	2024-12-13 11:15:09 -08:00
Nathan Kulczak	63f1518c06	Vibrator: Add permissions for owt_lib_compat Add permissions to access owt_lib_compat sysfs attribute Bug: 346570576 Flag: vendor.vibrator.hal.flags.enable_pwle_v2 Test: Flash to device and use access sysfs Change-Id: I73105a29b067d31951d137a02909335402388385 Signed-off-by: Nathan Kulczak <nathankulczak@google.com>	2024-12-10 17:44:21 +00:00
Android Build Coastguard Worker	fc7ef059c5	Snap for 12605939 from `ae2ed690b9` to mainline-tzdata6-release Change-Id: Ia899a53b271e8398db071b08f635a6bef0b8fda8	2024-11-05 10:09:45 +00:00
Android Build Coastguard Worker	1d1c9f155a	Snap for 12462067 from `117b1153bc` to mainline-tzdata6-release Change-Id: Icef02695be2d4b7e4d6661b3d07cfe788d715f8e	2024-10-07 08:57:41 +00:00
Android Build Coastguard Worker	a0e4c1c726	Snap for 12238800 from `c518352914` to mainline-tzdata6-release Change-Id: Ied506244a7f81a6289ffd7b21bf941f17db17cfe	2024-08-16 12:57:09 +00:00
Android Build Coastguard Worker	cf7e9c8e5a	Snap for 12034474 from `6177fcd458` to mainline-tzdata6-release Change-Id: Idc8c9b2adea6d07ff5ff1be156b2bf9a49435a8c	2024-07-01 08:34:02 +00:00
Android Build Coastguard Worker	a95714a899	Snap for 11947112 from `689ffcd4ea` to mainline-tzdata6-release Change-Id: I7a9fe2a31a4a364daa6798e8ef1cf6e9feb77017	2024-06-10 10:12:51 +00:00
Android Build Coastguard Worker	2650427807	Snap for 11919022 from `b35a112338` to mainline-tzdata6-release Change-Id: If059a148d2ea61647bf65980e0d1c0ab0e36e149	2024-06-03 15:30:50 +00:00
Android Build Coastguard Worker	6701bc89a0	Snap for 11607654 from `6275a87edb` to mainline-tzdata6-release Change-Id: Id9b97a1d29ffce6ccc4b2907615833eb24f881f9	2024-03-21 12:27:23 +00:00