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

Commit 70235c10 authored by Ashwin Prakash's avatar Ashwin Prakash
Browse files

Merge branch '1624-a16-avicii' into 'a16' 

avicii: Upgrade to a16

See merge request !12
parents 77e332a3 c07e2de1

Android.mk

deleted100644 → 0
+0 −40
Original line number Diff line number Diff line 
#

# Copyright (C) 2018-2024 The LineageOS Project

#

# SPDX-License-Identifier: Apache-2.0

#



LOCAL_PATH := $(call my-dir)



ifneq ($(filter avicii,$(TARGET_DEVICE)),)

include $(call all-makefiles-under,$(LOCAL_PATH))



include $(CLEAR_VARS)



# A/B builds require us to create the mount points at compile time.

# Just creating it for all cases since it does not hurt.

FIRMWARE_MOUNT_POINT := $(TARGET_OUT_VENDOR)/firmware_mnt

$(FIRMWARE_MOUNT_POINT): $(LOCAL_INSTALLED_MODULE)

	@echo "Creating $(FIRMWARE_MOUNT_POINT)"

	@mkdir -p $(TARGET_OUT_VENDOR)/firmware_mnt



BT_FIRMWARE_MOUNT_POINT := $(TARGET_OUT_VENDOR)/bt_firmware

$(BT_FIRMWARE_MOUNT_POINT): $(LOCAL_INSTALLED_MODULE)

	@echo "Creating $(BT_FIRMWARE_MOUNT_POINT)"

	@mkdir -p $(TARGET_OUT_VENDOR)/bt_firmware



DSP_MOUNT_POINT := $(TARGET_OUT_VENDOR)/dsp

$(DSP_MOUNT_POINT): $(LOCAL_INSTALLED_MODULE)

	@echo "Creating $(DSP_MOUNT_POINT)"

	@mkdir -p $(TARGET_OUT_VENDOR)/dsp



ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_MOUNT_POINT) $(BT_FIRMWARE_MOUNT_POINT) $(DSP_MOUNT_POINT)



ACDBDATA_SYMLINKS := $(TARGET_OUT_ODM)/etc/acdbdata

$(ACDBDATA_SYMLINKS): $(LOCAL_INSTALLED_MODULE)

	@echo "Creating acdbdata symlinks: $@"

	@mkdir -p $@

	$(hide) ln -sf /vendor/etc/acdbdata/adsp_avs_config.acdb $@/adsp_avs_config.acdb



ALL_DEFAULT_INSTALLED_MODULES +=  $(ACDBDATA_SYMLINKS)

endif

BoardConfig.mk

+15 −28
Original line number Diff line number Diff line
@@ -4,9 +4,6 @@ 
# SPDX-License-Identifier: Apache-2.0

#



BUILD_BROKEN_DUP_RULES := true

BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES := true



DEVICE_PATH := device/oneplus/avicii



# A/B
@@ -24,9 +21,6 @@ AB_OTA_PARTITIONS += \ 
    vbmeta_system \

    vendor



# ANT+

BOARD_ANT_WIRELESS_DEVICE := "qualcomm-hidl"



# Architecture

TARGET_ARCH := arm64

TARGET_ARCH_VARIANT := armv8-a
@@ -52,14 +46,19 @@ AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true 
AUDIO_FEATURE_ENABLED_SSR := true

AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := true

BOARD_SUPPORTS_SOUND_TRIGGER := true

BOARD_USES_ALSA_AUDIO := true



TARGET_PROVIDES_AUDIO_EXTNS := true



# Bootloader

TARGET_BOOTLOADER_BOARD_NAME := lito



# Display

TARGET_GRALLOC_HANDLE_HAS_RESERVED_SIZE := true



# Properties

TARGET_ODM_PROP += $(DEVICE_PATH)/odm.prop

TARGET_PRODUCT_PROP += $(DEVICE_PATH)/product.prop

TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop

TARGET_SYSTEM_EXT_PROP += $(DEVICE_PATH)/system_ext.prop

TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
@@ -79,20 +78,12 @@ TARGET_USES_QTI_MAPPER_EXTENSIONS_1_1 := true 
# Filesystem

TARGET_FS_CONFIG_GEN := $(DEVICE_PATH)/config.fs



# Fingerprint

TARGET_SURFACEFLINGER_UDFPS_LIB := //hardware/oplus:libudfps_extension.oplus



# HIDL

DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \

    hardware/oplus/vintf/device_framework_matrix.xml \

    hardware/qcom-caf/common/vendor_framework_compatibility_matrix.xml \

    vendor/lineage/config/device_framework_matrix.xml

    hardware/qcom-caf/common/vendor_framework_compatibility_matrix.xml

DEVICE_MATRIX_FILE := hardware/qcom-caf/common/compatibility_matrix.xml

DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/manifest.xml

ODM_MANIFEST_FILES := $(DEVICE_PATH)/manifest_odm.xml



# Init

TARGET_INIT_VENDOR_LIB := //$(DEVICE_PATH):libinit_oplus



# Kernel

BOARD_BOOT_HEADER_VERSION := 2
@@ -117,8 +108,9 @@ TARGET_KERNEL_ADDITIONAL_FLAGS := BRAND_SHOW_FLAG=oneplus 
TARGET_KERNEL_SOURCE := kernel/oneplus/sm7250

TARGET_KERNEL_CONFIG := vendor/lito-perf_defconfig vendor/debugfs.config



# Lineage Health

TARGET_HEALTH_CHARGING_CONTROL_CHARGING_PATH := /sys/class/oplus_chg/battery/mmi_charging_enable

# Kernel Clang Flags

KERNEL_CC := CC=clang

override KERNEL_TOOLCHAIN_PREFIX_arm := arm-linux-android-



# Platform

BOARD_USES_QCOM_HARDWARE := true
@@ -127,6 +119,9 @@ TARGET_BOARD_PLATFORM := lito 
# Metadata

BOARD_USES_METADATA_PARTITION := true



# OTA

TARGET_OTA_ASSERT_DEVICE := OnePlusNord,avicii



# Partitions

-include vendor/lineage/config/BoardConfigReservedSize.mk

BOARD_BOOTIMAGE_PARTITION_SIZE := 100663296
@@ -148,9 +143,6 @@ TARGET_COPY_OUT_PRODUCT := product 
TARGET_COPY_OUT_SYSTEM_EXT := system_ext

TARGET_COPY_OUT_VENDOR := vendor



# Power

TARGET_TAP_TO_WAKE_NODE := "/proc/touchpanel/double_tap_enable"



# Recovery

BOARD_INCLUDE_DTB_IN_BOOTIMG := true

BOARD_INCLUDE_RECOVERY_DTBO := true
@@ -170,15 +162,10 @@ VENDOR_SECURITY_PATCH := 2023-12-05 
include device/qcom/sepolicy_vndr/SEPolicy.mk

include hardware/oplus/sepolicy/qti/SEPolicy.mk



# Touch

SOONG_CONFIG_NAMESPACES += OPLUS_LINEAGE_TOUCH_HAL

SOONG_CONFIG_OPLUS_LINEAGE_TOUCH_HAL := INCLUDE_DIR

SOONG_CONFIG_OPLUS_LINEAGE_TOUCH_HAL_INCLUDE_DIR := $(DEVICE_PATH)/touch/include



# Verified Boot

BOARD_AVB_ENABLE := true

BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --set_hashtree_disabled_flag

BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 2

BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --set_verification_disabled_flag

BOARD_AVB_VBMETA_SYSTEM := system system_ext product

BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa4096.pem

BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA4096
@@ -192,10 +179,10 @@ BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE) 
BOARD_WPA_SUPPLICANT_DRIVER := $(BOARD_HOSTAPD_DRIVER)

BOARD_WPA_SUPPLICANT_PRIVATE_LIB := $(BOARD_HOSTAPD_PRIVATE_LIB)

BOARD_WPA_SUPPLICANT_PRIVATE_LIB_EVENT := "ON"

CONFIG_IEEE80211AX := true

WIFI_DRIVER_STATE_CTRL_PARAM := "/dev/wlan"

WIFI_DRIVER_STATE_OFF := "OFF"

WIFI_DRIVER_STATE_ON := "ON"

WIFI_FEATURE_HOSTAPD_11AX := true

WIFI_HIDL_FEATURE_DUAL_INTERFACE := true

WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true

WPA_SUPPLICANT_VERSION := VER_0_8_X

blob-patches/manifest_oplus_fingerprint.patch

0 → 100644
+11 −0
Original line number Diff line number Diff line 
--- a/manifest_oplus_fingerprint.xml

+++ b/manifest_oplus_fingerprint.xml

@@ -14,7 +14,7 @@

  *************************************************************/

 -->

 <manifest version="1.0" type="device">

-    <hal format="hidl">

+    <hal override="true" format="hidl">

         <name>android.hardware.biometrics.fingerprint</name>

         <transport>hwbinder</transport>

         <version>2.3</version>

board-info.txt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
require board=avicii|OnePlusNord|lito

device.mk

+42 −58
Original line number Diff line number Diff line 
#

# Copyright (C) 2018 The LineageOS Project

# Copyright (C) 2018-2025 The LineageOS Project

#

# SPDX-License-Identifier: Apache-2.0

#
@@ -24,20 +24,11 @@ PRODUCT_PACKAGES += \ 
    checkpoint_gc \

    otapreopt_script



# ANT+

PRODUCT_PACKAGES += \

    AntHalService-Soong \

    com.dsi.ant@1.0.vendor



# Alert slider

PRODUCT_PACKAGES += \

    KeyHandler \

    tri-state-key-calibrate



# Atrace

PRODUCT_PACKAGES += \

    android.hardware.atrace@1.0-service



# Audio

PRODUCT_PACKAGES += \

    android.hardware.audio@6.0-impl \
@@ -48,17 +39,9 @@ PRODUCT_PACKAGES += \ 
    audio.bluetooth.default \

    audio.r_submix.default \

    audio.usb.default \

    liba2dpoffload \

    libbatterylistener \

    libcomprcapture \

    libexthwplugin \

    libhdmiedid \

    libhfp \

    libqcompostprocbundle \

    libqcomvisualizer \

    libqcomvoiceprocessing \

    libsndmonitor \

    libspkrprot \

    libvolumelistener



PRODUCT_COPY_FILES += \
@@ -107,9 +90,10 @@ PRODUCT_COPY_FILES += \ 


# Boot control

PRODUCT_PACKAGES += \

    android.hardware.boot@1.1-impl-qti \

    android.hardware.boot@1.1-impl-qti.recovery \

    android.hardware.boot@1.1-service

    android.hardware.boot-service.qti \

    android.hardware.boot-service.qti.recovery



$(call soong_config_set,QTI_GPT_UTILS,USE_BSG_FRAMEWORK,false)



# Camera

PRODUCT_PACKAGES += \
@@ -143,20 +127,20 @@ PRODUCT_COPY_FILES += \ 
PRODUCT_PACKAGES += \

    android.hardware.graphics.mapper@3.0-impl-qti-display \

    android.hardware.graphics.mapper@4.0-impl-qti-display \

    gralloc.lito \

    gralloc.qcom \

    libdisplayconfig.qti \

    libdisplayconfig.system.qti \

    libqdMetaData \

    libqdMetaData.system \

    libsdmcore \

    libsdmutils \

    libtinyxml \

    libvulkan \

    vendor.display.config@1.9.vendor \

    vendor.display.config@2.0 \

    vendor.display.config@2.0.vendor \

    vendor.qti.hardware.display.allocator-service \

    vendor.qti.hardware.display.composer-service \

    vendor.qti.hardware.display.composer-service.rc \

    vendor.qti.hardware.display.composer-service.xml \

    vendor.qti.hardware.display.config-V5-ndk \

    vendor.qti.hardware.display.mapper@1.1.vendor \

    vendor.qti.hardware.display.mapper@2.0.vendor \
@@ -189,6 +173,8 @@ PRODUCT_PACKAGES += \ 
PRODUCT_COPY_FILES += \

    frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml



$(call soong_config_set,surfaceflinger,udfps_lib,//hardware/oplus:libudfps_extension.oplus)



# Gatekeeper

PRODUCT_PACKAGES += \

    android.hardware.gatekeeper@1.0.vendor
@@ -249,10 +235,13 @@ PRODUCT_PACKAGES += \ 
    init.qcom.sh \

    init.qcom.usb.rc \

    init.qcom.usb.sh \

    init.qti.media.sh \

    init.target.rc \

    ueventd.oplus.rc \

    ueventd.qcom.rc



$(call soong_config_set,libinit,vendor_init_lib,//$(LOCAL_PATH):libinit_oplus)



# Keymaster

PRODUCT_PACKAGES += \

    android.hardware.keymaster@4.1.vendor
@@ -261,24 +250,25 @@ PRODUCT_PACKAGES += \ 
PRODUCT_PACKAGES += \

    vendor.lineage.health-service.default



$(call soong_config_set,lineage_health,charging_control_charging_path,/sys/class/oplus_chg/battery/mmi_charging_enable)



# LiveDisplay

PRODUCT_PACKAGES += \

    vendor.lineage.livedisplay@2.1-service.oplus

    vendor.lineage.livedisplay-service.oplus



# Media

PRODUCT_COPY_FILES += \

    frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \

    frameworks/av/media/libstagefright/data/media_codecs_google_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_c2.xml \

    frameworks/av/media/libstagefright/data/media_codecs_google_c2_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_c2_audio.xml \

    frameworks/av/media/libstagefright/data/media_codecs_google_c2_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_c2_video.xml \

    frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_telephony.xml \

    frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml \

    frameworks/av/media/libstagefright/data/media_codecs_google_video_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video_le.xml

    $(LOCAL_PATH)/media/media_codecs_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \

    $(LOCAL_PATH)/media/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \

    $(LOCAL_PATH)/media/media_codecs_performance_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_c2.xml \

    $(LOCAL_PATH)/media/video_system_specs.json:$(TARGET_COPY_OUT_VENDOR)/etc/video_system_specs.json



PRODUCT_PACKAGES += \

    libavservices_minijail \

    libavservices_minijail.vendor



$(call soong_config_set,stagefright,target_disable_thumbnail_block_model,true)



# Net

PRODUCT_PACKAGES += \

    android.system.net.netd@1.1.vendor
@@ -291,7 +281,6 @@ PRODUCT_PACKAGES += \ 
PRODUCT_PACKAGES += \

    android.hardware.nfc-service.nxp \

    com.android.nfc_extras \

    NfcNci \

    Tag



PRODUCT_COPY_FILES += \
@@ -304,19 +293,6 @@ PRODUCT_COPY_FILES += \ 
    frameworks/native/data/etc/android.hardware.se.omapi.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.se.omapi.uicc.xml \

    frameworks/native/data/etc/com.android.nfc_extras.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.android.nfc_extras.xml



# OMX

PRODUCT_PACKAGES += \

    init.qti.media.sh \

    libOmxAacEnc \

    libOmxAmrEnc \

    libOmxCore \

    libOmxEvrcEnc \

    libOmxG711Enc \

    libOmxQcelp13Enc \

    libOmxVdec \

    libOmxVenc \

    libstagefrighthw



# Overlays

$(call inherit-product, hardware/oplus/overlay/generic/generic.mk)

$(call inherit-product, hardware/oplus/overlay/qssi/qssi.mk)
@@ -328,6 +304,7 @@ PRODUCT_ENFORCE_RRO_TARGETS := * 
PRODUCT_PACKAGES += \

    CarrierConfigResCommon \

    FrameworksResTarget \

    NcmTetheringOverlay \

    OPlusFrameworksResCommon \

    OPlusFrameworksResTarget \

    OPlusSettingsProviderResTarget \
@@ -338,6 +315,11 @@ PRODUCT_PACKAGES += \ 
    WifiResTarget



# Partitions

PRODUCT_PACKAGES += \

    vendor_bt_firmware_mountpoint \

    vendor_dsp_mountpoint \

    vendor_firmware_mnt_mountpoint



PRODUCT_USE_DYNAMIC_PARTITIONS := true



# Power
@@ -346,6 +328,8 @@ PRODUCT_PACKAGES += \ 
    android.hardware.power@1.2.vendor \

    vendor.qti.hardware.perf@2.2.vendor



$(call soong_config_set,qtipower,tap_to_wake_node,/proc/touchpanel/double_tap_enable)



# QMI

PRODUCT_PACKAGES += \

    libcurl.vendor:64 \
@@ -365,13 +349,9 @@ PRODUCT_PACKAGES += \ 
    libprotobuf-cpp-lite-3.9.1-vendorcompat \

    librmnetctl



# Seccomp policy

PRODUCT_COPY_FILES += \

    $(LOCAL_PATH)/seccomp/mediacodec.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy



# Sensors

PRODUCT_PACKAGES += \

    android.hardware.sensors@2.0-service.multihal \

    android.hardware.sensors-service.multihal \

    libdumpstateutil.vendor:64 \

    libsensorndkbridge \

    sensors.oplus
@@ -427,9 +407,15 @@ PRODUCT_COPY_FILES += \ 


$(call inherit-product, hardware/oplus/oplus-fwk/oplus-fwk.mk)



# Thermal

PRODUCT_PACKAGES += \

    android.hardware.thermal-service.qti



# Touch

PRODUCT_PACKAGES += \

    vendor.lineage.touch@1.0-service.oplus

    vendor.lineage.touch-service.oplus



$(call soong_config_set,OPLUS_LINEAGE_TOUCH_HAL,INCLUDE_DIR,$(LOCAL_PATH)/touch/include)



# Update engine

PRODUCT_PACKAGES += \
@@ -442,7 +428,9 @@ PRODUCT_PACKAGES_DEBUG += \ 


# USB

PRODUCT_PACKAGES += \

    android.hardware.usb@1.3-service-qti

    android.hardware.usb-service.qti \

    android.hardware.usb.gadget-service.qti \

    oplus_usb_compositions.conf



PRODUCT_SOONG_NAMESPACES += \

    vendor/qcom/opensource/usb/etc
@@ -473,7 +461,6 @@ PRODUCT_USE_PRODUCT_VNDK_OVERRIDE := true 
PRODUCT_PACKAGES += \

    android.hardware.wifi-service \

    hostapd \

    libwpa_client \

    libwifi-hal-ctrl \

    libwifi-hal-qcom \

    vendor.qti.hardware.wifi.hostapd@1.2.vendor \
@@ -485,18 +472,15 @@ PRODUCT_COPY_FILES += \ 
    frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml \

    frameworks/native/data/etc/android.hardware.wifi.passpoint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.passpoint.xml \

    frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml \

    frameworks/native/data/etc/android.software.ipsec_tunnel_migration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.ipsec_tunnel_migration.xml \

    frameworks/native/data/etc/android.software.ipsec_tunnels.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.ipsec_tunnels.xml



# WiFi Display

PRODUCT_PACKAGES += \

    android.media.audio.common.types-V2-cpp \

    libnl \

    libpng.vendor:32 \

    libwfdaac_vendor



PRODUCT_BOOT_JARS += \

    WfdCommon



# WiFi firmware symlinks

PRODUCT_PACKAGES += \

    firmware_wlan_mac.bin_symlink \