Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6eaf35f authored by Pete Fotheringham's avatar Pete Fotheringham
Browse files

Merge branch 'lineage-17.1' into '3866-suzuran-upstream-l17-changes' 

kitakami-common: Merge upstream LOS17 changes into /e/'s v1-q branch

See merge request !1
parents a4843cbf 2263628b

Android.bp

+3 −0
Original line number Diff line number Diff line 
soong_namespace {

}



subdirs = [

    "light",

]

BoardConfigCommon.mk

+3 −3
Original line number Diff line number Diff line
@@ -34,13 +34,13 @@ TARGET_ARCH := arm64 
TARGET_ARCH_VARIANT := armv8-a

TARGET_CPU_ABI := arm64-v8a

TARGET_CPU_ABI2 :=

TARGET_CPU_VARIANT := generic

TARGET_CPU_VARIANT := cortex-a53



TARGET_2ND_ARCH := arm

TARGET_2ND_ARCH_VARIANT := armv8-a

TARGET_2ND_CPU_ABI := armeabi-v7a

TARGET_2ND_CPU_ABI2 := armeabi

TARGET_2ND_CPU_VARIANT := generic

TARGET_2ND_CPU_VARIANT := cortex-a53

TARGET_2ND_CPU_VARIANT_RUNTIME := cortex-a53



TARGET_USES_64_BIT_BINDER := true
@@ -209,7 +209,7 @@ BOARD_WPA_SUPPLICANT_DRIVER := NL80211 
BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE)

BOARD_HOSTAPD_DRIVER        := NL80211

BOARD_HOSTAPD_PRIVATE_LIB   := lib_driver_cmd_$(BOARD_WLAN_DEVICE)

WIFI_DRIVER_FW_PATH_PARAM   := "/sys/module/bcmdhd/parameters/firmware_path"

WIFI_DRIVER_FW_PATH_PARAM   := "/sys/module/wlan/parameters/firmware_path"

WIFI_DRIVER_FW_PATH_AP      := "/system/etc/firmware/wlan/bcmdhd/fw_bcmdhd_apsta.bin"

WIFI_DRIVER_FW_PATH_STA     := "/system/etc/firmware/wlan/bcmdhd/fw_bcmdhd.bin"

WPA_SUPPLICANT_VERSION      := VER_0_8_X

audio/audio_effects.xml

+39 −19
Original line number Diff line number Diff line
@@ -3,31 +3,51 @@ 
    <libraries>

        <library name="bundle" path="libbundlewrapper.so"/>

        <library name="reverb" path="libreverbwrapper.so"/>

        <library name="visualizer" path="libvisualizer.so"/>

        <library name="visualizer_sw" path="libvisualizer.so"/>

        <library name="visualizer_hw" path="libqcomvisualizer.so"/>

        <library name="downmix" path="libdownmix.so"/>

        <library name="loudness_enhancer" path="libldnhncr.so"/>

        <library name="audio_pre_processing" path="libqcomvoiceprocessing.so"/>

        <library name="proxy" path="libeffectproxy.so"/>

        <library name="sonyeffect_sw" path="libsonysweffect.so"/>

        <library name="sonyeffect_hw" path="libsonypostprocbundle.so"/>

        <library name="offload_bundle" path="libqcompostprocbundle.so"/>

        <library name="qcom_pre_processing" path="libqcomvoiceprocessing.so"/>

        <library name="loudness_enhancer" path="libldnhncr.so"/>

    </libraries>

    <effects>

        <effect name="bassboost" library="bundle" uuid="8631f300-72e2-11df-b57e-0002a5d5c51b"/>

        <effect name="virtualizer" library="bundle" uuid="1d4033c0-8557-11df-9f2d-0002a5d5c51b"/>

        <effect name="equalizer" library="bundle" uuid="ce772f20-847d-11df-bb17-0002a5d5c51b"/>

        <effectProxy name="bassboost" library="proxy" uuid="14804144-a5ee-4d24-aa88-0002a5d5c51b">

            <libsw library="bundle" uuid="8631f300-72e2-11df-b57e-0002a5d5c51b"/>

            <libhw library="offload_bundle" uuid="2c4a8c24-1581-487f-94f6-0002a5d5c51b"/>

        </effectProxy>

        <effectProxy name="virtualizer" library="proxy" uuid="d3467faa-acc7-4d34-acaf-0002a5d5c51b">

            <libsw library="bundle" uuid="1d4033c0-8557-11df-9f2d-0002a5d5c51b"/>

            <libhw library="offload_bundle" uuid="509a4498-561a-4bea-b3b1-0002a5d5c51b"/>

        </effectProxy>

        <effectProxy name="equalizer" library="proxy" uuid="c8e70ecd-48ca-456e-8a4f-0002a5d5c51b">

            <libsw library="bundle" uuid="ce772f20-847d-11df-bb17-0002a5d5c51b"/>

            <libhw library="offload_bundle" uuid="a0dac280-401c-11e3-9379-0002a5d5c51b"/>

        </effectProxy>

        <effect name="volume" library="bundle" uuid="119341a0-8469-11df-81f9-0002a5d5c51b"/>

        <effect name="reverb_env_aux" library="reverb" uuid="4a387fc0-8ab3-11df-8bad-0002a5d5c51b"/>

        <effect name="reverb_env_ins" library="reverb" uuid="c7a511a0-a3bb-11df-860e-0002a5d5c51b"/>

        <effect name="reverb_pre_aux" library="reverb" uuid="f29a1400-a3bb-11df-8ddc-0002a5d5c51b"/>

        <effect name="reverb_pre_ins" library="reverb" uuid="172cdf00-a3bc-11df-a72f-0002a5d5c51b"/>

        <effect name="visualizer" library="visualizer" uuid="d069d9e0-8329-11df-9168-0002a5d5c51b"/>

        <effectProxy name="reverb_env_aux" library="proxy" uuid="48404ac9-d202-4ccc-bf84-0002a5d5c51b">

            <libsw library="reverb" uuid="4a387fc0-8ab3-11df-8bad-0002a5d5c51b"/>

            <libhw library="offload_bundle" uuid="79a18026-18fd-4185-8233-0002a5d5c51b"/>

        </effectProxy>

        <effectProxy name="reverb_env_ins" library="proxy" uuid="b707403a-a1c1-4291-9573-0002a5d5c51b">

            <libsw library="reverb" uuid="c7a511a0-a3bb-11df-860e-0002a5d5c51b"/>

            <libhw library="offload_bundle" uuid="eb64ea04-973b-43d2-8f5e-0002a5d5c51b"/>

        </effectProxy>

        <effectProxy name="reverb_pre_aux" library="proxy" uuid="1b78f587-6d1c-422e-8b84-0002a5d5c51b">

            <libsw library="reverb" uuid="f29a1400-a3bb-11df-8ddc-0002a5d5c51b"/>

            <libhw library="offload_bundle" uuid="6987be09-b142-4b41-9056-0002a5d5c51b"/>

        </effectProxy>

        <effectProxy name="reverb_pre_ins" library="proxy" uuid="f3e178d2-ebcb-408e-8357-0002a5d5c51b">

            <libsw library="reverb" uuid="172cdf00-a3bc-11df-a72f-0002a5d5c51b"/>

            <libhw library="offload_bundle" uuid="aa2bebf6-47cf-4613-9bca-0002a5d5c51b"/>

        </effectProxy>

        <effectProxy name="visualizer" library="proxy" uuid="1d0a1a53-7d5d-48f2-8e71-27fbd10d842c">

            <libsw library="visualizer_sw" uuid="d069d9e0-8329-11df-9168-0002a5d5c51b"/>

            <libhw library="visualizer_hw" uuid="7a8044a0-1a71-11e3-a184-0002a5d5c51b"/>

        </effectProxy>

        <effect name="downmix" library="downmix" uuid="93f04452-e4fe-41cc-91f9-e475b6d1d69f"/>

        <effect name="loudness_enhancer" library="loudness_enhancer" uuid="fa415329-2034-4bea-b5dc-5b381c8d1e2c"/>

        <effect name="aec" library="audio_pre_processing" uuid="0f8d0d2a-59e5-45fe-b6e4-248c8a799109"/>

        <effect name="ns" library="audio_pre_processing" uuid="1d97bb0b-9e2f-4403-9ae3-58c2554306f8"/>

        <effectProxy name="sonyeffect" library="proxy" uuid="af8da7e0-2ca1-11e3-b71d-0002a5d5c51b">

            <libsw library="sonyeffect_sw" uuid="50786e95-da76-4557-976b-7981bdf6feb9"/>

            <libhw library="sonyeffect_hw" uuid="f9ed8ae0-1b9c-11e4-8900-0002a5d5c51b"/>

        </effectProxy>

        <effect name="aec" library="qcom_pre_processing" uuid="0f8d0d2a-59e5-45fe-b6e4-248c8a799109"/>

        <effect name="ns" library="qcom_pre_processing" uuid="1d97bb0b-9e2f-4403-9ae3-58c2554306f8"/>

    </effects>

</audio_effects_conf>

audio/audio_policy_configuration.xml

+9 −13
Original line number Diff line number Diff line
@@ -63,10 +63,6 @@ 
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="raw" role="source" flags="AUDIO_OUTPUT_FLAG_FAST|AUDIO_OUTPUT_FLAG_RAW">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="deep_buffer" role="source"

                        flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@@ -239,25 +235,25 @@ 
            <!-- route declaration, i.e. list all available sources for a given sink -->

            <routes>

                <route type="mix" sink="Earpiece"

                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,BT SCO Headset Mic"/>

                       sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,BT SCO Headset Mic"/>

                <route type="mix" sink="Speaker"

                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,BT SCO Headset Mic,Telephony Rx"/>

                       sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,BT SCO Headset Mic,Telephony Rx"/>

                <route type="mix" sink="Wired Headset"

                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,BT SCO Headset Mic,Telephony Rx"/>

                       sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,BT SCO Headset Mic,Telephony Rx"/>

                <route type="mix" sink="Wired Headphones"

                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,BT SCO Headset Mic,Telephony Rx"/>

                       sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,BT SCO Headset Mic,Telephony Rx"/>

                <route type="mix" sink="HDMI"

                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload"/>

                       sources="primary output,deep_buffer,direct_pcm,compressed_offload"/>

                <route type="mix" sink="Proxy"

                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload"/>

                       sources="primary output,deep_buffer,direct_pcm,compressed_offload"/>

                <route type="mix" sink="FM"

                       sources="primary output"/>

                <route type="mix" sink="BT SCO"

                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>

                       sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>

                <route type="mix" sink="BT SCO Headset"

                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>

                       sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>

                <route type="mix" sink="BT SCO Car Kit"

                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>

                       sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>

                <route type="mix" sink="Telephony Tx"

                       sources="voice_tx"/>

                <route type="mix" sink="primary input"

device-common.mk

+20 −16
Original line number Diff line number Diff line 
#

# Copyright (C) 2016 The CyanogenMod Project

# Copyright (C) 2017-2020 The LineageOS Project

# Copyright (C) 2017-2021 The LineageOS Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.
@@ -120,7 +120,7 @@ PRODUCT_COPY_FILES += \ 


# Bluetooth

PRODUCT_COPY_FILES += \

    $(LOCAL_PATH)/bluetooth/bt_vendor.conf:system/etc/bluetooth/bt_vendor.conf

    $(LOCAL_PATH)/bluetooth/bt_vendor.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/bluetooth/bt_vendor.conf



PRODUCT_PACKAGES += \

    android.hardware.bluetooth@1.0-impl \
@@ -188,17 +188,17 @@ PRODUCT_PACKAGES += \ 
    libshim_gps



PRODUCT_COPY_FILES += \

    $(LOCAL_PATH)/gps/flp.conf:system/etc/flp.conf \

    $(LOCAL_PATH)/gps/gps.conf:system/etc/gps.conf \

    $(LOCAL_PATH)/gps/izat.conf:system/etc/izat.conf \

    $(LOCAL_PATH)/gps/sap.conf:system/etc/sap.conf

    $(LOCAL_PATH)/gps/flp.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/flp.conf \

    $(LOCAL_PATH)/gps/gps.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/gps.conf \

    $(LOCAL_PATH)/gps/izat.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/izat.conf \

    $(LOCAL_PATH)/gps/sap.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/sap.conf



PRODUCT_PACKAGES += \

    android.hardware.gnss@1.0-impl



# Flash LED config

PRODUCT_COPY_FILES += \

    $(LOCAL_PATH)/configs/flashled_calc_parameters.cfg:system/etc/flashled_calc_parameters.cfg

    $(LOCAL_PATH)/configs/flashled_calc_parameters.cfg:$(TARGET_COPY_OUT_SYSTEM)/etc/flashled_calc_parameters.cfg



# Health

PRODUCT_PACKAGES += \
@@ -206,18 +206,18 @@ PRODUCT_PACKAGES += \ 


# Init

PRODUCT_COPY_FILES += \

    $(LOCAL_PATH)/rootdir/fstab.qcom:root/fstab.qcom \

    $(LOCAL_PATH)/rootdir/init.qcom.usb.rc:root/init.qcom.usb.rc \

    $(LOCAL_PATH)/rootdir/init.qcom.rc:root/init.qcom.rc \

    $(LOCAL_PATH)/rootdir/ueventd.qcom.rc:root/ueventd.qcom.rc

    $(LOCAL_PATH)/rootdir/fstab.qcom:$(TARGET_COPY_OUT_ROOT)/fstab.qcom \

    $(LOCAL_PATH)/rootdir/init.qcom.usb.rc:$(TARGET_COPY_OUT_ROOT)/init.qcom.usb.rc \

    $(LOCAL_PATH)/rootdir/init.qcom.rc:$(TARGET_COPY_OUT_ROOT)/init.qcom.rc \

    $(LOCAL_PATH)/rootdir/ueventd.qcom.rc:$(TARGET_COPY_OUT_ROOT)/ueventd.qcom.rc



# Input

PRODUCT_COPY_FILES += \

    $(LOCAL_PATH)/keylayout/clearpad.kl:system/usr/keylayout/clearpad.kl \

    $(LOCAL_PATH)/keylayout/gpio-keys.kl:system/usr/keylayout/gpio-keys.kl \

    $(LOCAL_PATH)/keylayout/mhl-rcp.kl:system/usr/keylayout/mhl-rcp.kl \

    $(LOCAL_PATH)/keylayout/msm8994-tomtom-snd-card_Button_Jack.kl:system/usr/keylayout/msm8994-tomtom-snd-card_Button_Jack.kl \

    $(LOCAL_PATH)/keylayout/synaptics_dsx.kl:system/usr/keylayout/synaptics_dsx.kl

    $(LOCAL_PATH)/keylayout/clearpad.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/clearpad.kl \

    $(LOCAL_PATH)/keylayout/gpio-keys.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/gpio-keys.kl \

    $(LOCAL_PATH)/keylayout/mhl-rcp.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/mhl-rcp.kl \

    $(LOCAL_PATH)/keylayout/msm8994-tomtom-snd-card_Button_Jack.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/msm8994-tomtom-snd-card_Button_Jack.kl \

    $(LOCAL_PATH)/keylayout/synaptics_dsx.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/synaptics_dsx.kl



# IRQ

PRODUCT_COPY_FILES += \
@@ -312,6 +312,10 @@ PRODUCT_PACKAGES += \ 
PRODUCT_PACKAGES += \

   camera.qcom_shim



# Soong

PRODUCT_SOONG_NAMESPACES += \

    device/sony/kitakami-common



# TimeKeep

PRODUCT_PACKAGES += \

    timekeep \