Compare commits

..

No commits in common. "lineage-22.2" and "lineage-22.1" have entirely different histories.

11 changed files with 72 additions and 118 deletions

View file

@ -1,7 +1,6 @@
//
// Copyright (C) 2021-2024 The LineageOS Project
// SPDX-License-Identifier: Apache-2.0
// Copyright (C) 2019-Current A-Team Digital Solutions
//
soong_namespace {

View file

@ -1,9 +1,11 @@
#
# Copyright (C) 2021-2024 The LineageOS Project
#
# SPDX-License-Identifier: Apache-2.0
# Copyright (C) 2019-Current A-Team Digital Solutions
#
LOCAL_PATH := $(call my-dir)
ifeq ($(TARGET_DEVICE),dre)
include $(call all-makefiles-under,$(LOCAL_PATH))
endif
endif

View file

@ -13,6 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# Copyright (C) 2019-Current A-Team Digital Solutions
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/bliss_dre.mk
$(LOCAL_DIR)/lineage_dre.mk

View file

@ -1,6 +1,8 @@
#
# Copyright (C) 2021-2024 The LineageOS Project
#
# SPDX-License-Identifier: Apache-2.0
# Copyright (C) 2019-Current A-Team Digital Solutions
#
DEVICE_PATH := device/oneplus/dre

View file

@ -1,6 +1,8 @@
#
# Copyright (C) 2021-2025 The LineageOS Project
#
# SPDX-License-Identifier: Apache-2.0
# Copyright (C) 2019-Current A-Team Digital Solutions
#
# Add common definitions for Qualcomm
$(call inherit-product, hardware/qcom-caf/common/common.mk)
@ -319,9 +321,6 @@ PRODUCT_PACKAGES += \
qti_telephony_utils_prd.xml \
telephony-ext
PRODUCT_PACKAGES += \
qcrilNrDb_vendor
PRODUCT_BOOT_JARS += \
telephony-ext
@ -386,6 +385,7 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \
android.hardware.wifi-service \
hostapd \
libwpa_client \
libwifi-hal-ctrl \
libwifi-hal-qcom \
wpa_supplicant \

View file

@ -9,6 +9,7 @@ from extract_utils.fixups_blob import (
blob_fixups_user_type,
)
from extract_utils.fixups_lib import (
lib_fixup_remove,
lib_fixups,
lib_fixups_user_type,
)
@ -43,6 +44,9 @@ lib_fixups: lib_fixups_user_type = {
'vendor.qti.hardware.wifidisplaysession@1.0',
'vendor.qti.imsrtpservice@3.0',
): lib_fixup_vendor_suffix,
(
'libwpa_client',
): lib_fixup_remove,
}
blob_fixups: blob_fixups_user_type = {
@ -50,6 +54,24 @@ blob_fixups: blob_fixups_user_type = {
.regex_replace('writepid /dev/cpuset/foreground/tasks', 'task_profiles ProcessCapacityHigh'),
('odm/lib/liblvimfs_wrapper.so', 'odm/lib64/libCOppLceTonemapAPI.so', 'odm/lib64/libaps_frame_registration.so'): blob_fixup()
.replace_needed('libstdc++.so', 'libstdc++_vendor.so'),
('odm/lib64/libwvhidl.so','odm/lib64/mediadrm/libwvdrmengine.so'): blob_fixup()
.add_needed('libcrypto_shim.so'),
'product/etc/sysconfig/com.android.hotwordenrollment.common.util.xml': blob_fixup()
.regex_replace('/my_product', '/product'),
'system_ext/lib/libwfdmmsrc_system.so': blob_fixup()
.add_needed('libgui_shim.so'),
'system_ext/lib/libwfdservice.so': blob_fixup()
.replace_needed('android.media.audio.common.types-V2-cpp.so', 'android.media.audio.common.types-V4-cpp.so'),
'system_ext/lib64/libwfdnative.so': blob_fixup()
.replace_needed('android.hidl.base@1.0.so', 'libhidlbase.so')
.add_needed('libbinder_shim.so')
.add_needed('libinput_shim.so'),
'vendor/bin/init.kernel.post_boot-blair.sh': blob_fixup()
.patch_file('blob-patches/init-post-boot-blair.patch'),
'vendor/bin/init.kernel.post_boot-holi.sh': blob_fixup()
.patch_file('blob-patches/init-post-boot-holi.patch'),
'vendor/etc/init/vendor.qti.media.c2@1.0-service.rc': blob_fixup()
.regex_replace('writepid /dev/cpuset/foreground/tasks', 'task_profiles ProcessCapacityHigh'),
'odm/lib64/libarcsoft_portrait_super_night_raw.so': blob_fixup()
.clear_symbol_version('remote_handle_close')
.clear_symbol_version('remote_handle_invoke')
@ -68,30 +90,10 @@ blob_fixups: blob_fixups_user_type = {
.clear_symbol_version('AHardwareBuffer_lock')
.clear_symbol_version('AHardwareBuffer_release')
.clear_symbol_version('AHardwareBuffer_unlock'),
('odm/lib64/libwvhidl.so','odm/lib64/mediadrm/libwvdrmengine.so'): blob_fixup()
.add_needed('libcrypto_shim.so'),
'product/etc/sysconfig/com.android.hotwordenrollment.common.util.xml': blob_fixup()
.regex_replace('/my_product', '/product'),
'system_ext/bin/wfdservice': blob_fixup()
.add_needed('libwfdservice_shim.so'),
'system_ext/lib/libwfdmmsrc_system.so': blob_fixup()
.add_needed('libgui_shim.so'),
'system_ext/lib/libwfdservice.so': blob_fixup()
.replace_needed('android.media.audio.common.types-V2-cpp.so', 'android.media.audio.common.types-V4-cpp.so'),
'system_ext/lib64/libwfdnative.so': blob_fixup()
.replace_needed('android.hidl.base@1.0.so', 'libhidlbase.so')
.add_needed('libbinder_shim.so')
.add_needed('libinput_shim.so'),
'vendor/bin/init.kernel.post_boot-blair.sh': blob_fixup()
.patch_file('blob-patches/init-post-boot-blair.patch'),
'vendor/bin/init.kernel.post_boot-holi.sh': blob_fixup()
.patch_file('blob-patches/init-post-boot-holi.patch'),
'vendor/etc/init/vendor.qti.media.c2@1.0-service.rc': blob_fixup()
.regex_replace('writepid /dev/cpuset/foreground/tasks', 'task_profiles ProcessCapacityHigh'),
'vendor/etc/media_holi/video_system_specs.json': blob_fixup()
.regex_replace('"max_retry_alloc_output_timeout": 2000,', '"max_retry_alloc_output_timeout": 0,'),
'vendor/etc/libnfc-nci.conf': blob_fixup()
.regex_replace('NFC_DEBUG_ENABLED=1', 'NFC_DEBUG_ENABLED=0'),
'vendor/etc/media_holi/video_system_specs.json': blob_fixup()
.regex_replace('"max_retry_alloc_output_timeout": 2000,', '"max_retry_alloc_output_timeout": 0,'),
'vendor/etc/msm_irqbalance.conf': blob_fixup()
.regex_replace('IGNORED_IRQ=19,21,38$', 'IGNORED_IRQ=19,21,38,209,218'),
'vendor/etc/qdcm_calib_data_nt36672c_tm_fhd_plus_video_mode_dsi_panel.xml': blob_fixup()

View file

@ -1,4 +1,6 @@
#
# Copyright (C) 2021-2023 The LineageOS Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
@ -10,7 +12,7 @@
# 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.
# Copyright (C) 2019-Current A-Team Digital Solutions
#
# Inherit from those products. Most specific first.
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
@ -20,10 +22,10 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
# Inherit from dre device
$(call inherit-product, device/oneplus/dre/device.mk)
# Inherit some common Bliss stuff.
$(call inherit-product, vendor/bliss/config/common_full_phone.mk)
# Inherit some common Lineage stuff.
$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
PRODUCT_NAME := bliss_dre
PRODUCT_NAME := lineage_dre
PRODUCT_DEVICE := dre
PRODUCT_MANUFACTURER := OnePlus
PRODUCT_BRAND := OnePlus

View file

@ -15,6 +15,10 @@ vendor/etc/acdbdata/nn_ns_models/fai__2.2.0_0.1__3.0.0_0.0__eai_1.00.pmd|92885cb
vendor/etc/acdbdata/nn_vad_models/fai_3.0.0_0.0_eai_1.00.pmd|b761b7b9d0b2e782ec557b0c333cc3efa924db4f
vendor/etc/acdbdata/adsp_avs_config.acdb;SYMLINK=odm/etc/acdbdata/adsp_avs_config.acdb|43fde53eaafb40ac88e5c7e2e17dd534f84d5efd
# Current blobs with ELF checks disabled:
# libOmxVideoDSMode depends on libOmxCore, which is a gnu makefile target
# libcne, libwqe, lowi-server depend on libwpa_client, which is a gnu makefile target
# ADSP
vendor/bin/adsprpcd
vendor/bin/dspservice
@ -805,7 +809,7 @@ vendor/etc/charger_fstab.qti
# CNE
vendor/app/CneApp/CneApp.apk;REQUIRED=CneApp.libvndfwk_detect_jni.qti_symlink
vendor/bin/cnd
vendor/bin/mutualex
vendor/bin/mutualex;DISABLE_CHECKELF
vendor/etc/cne/wqeclient/ATT/ATT_profile1.xml
vendor/etc/cne/wqeclient/ATT/ATT_profile2.xml
vendor/etc/cne/wqeclient/ATT/ATT_profile3.xml
@ -839,12 +843,12 @@ vendor/etc/default-permissions/com.qualcomm.qti.cne.xml
vendor/etc/init/cnd.rc
vendor/etc/init/mutualex.rc
vendor/lib/libxml.so
vendor/lib64/libcne.so
vendor/lib64/libcne.so;DISABLE_CHECKELF
vendor/lib64/libcneapiclient.so
vendor/lib64/libcneoplookup.so
vendor/lib64/libcneqmiutils.so
vendor/lib64/libwms.so
vendor/lib64/libwqe.so
vendor/lib64/libwqe.so;DISABLE_CHECKELF
vendor/lib64/libxml.so
vendor/lib64/vendor.qti.data.factory@2.0.so
vendor/lib64/vendor.qti.data.factory@2.1.so
@ -1096,7 +1100,7 @@ odm/etc/sap.conf
vendor/app/CACertService/CACertService.apk
vendor/bin/hw/android.hardware.gnss@2.1-service-qti
vendor/bin/loc_launcher
vendor/bin/lowi-server
vendor/bin/lowi-server;DISABLE_CHECKELF
vendor/bin/mlid
vendor/bin/slim_daemon
vendor/bin/xtra-daemon
@ -1501,28 +1505,27 @@ vendor/etc/init/shsusrd.rc
vendor/etc/init/ssgtzd.rc
vendor/etc/init/vendor.qti.rmt_storage.rc
vendor/etc/init/vendor.qti.tftp.rc
vendor/etc/qcril_database/upgrade/config/10.0_config.sql;FILEGROUP=proprietary_rildb_config_sql_files
vendor/etc/qcril_database/upgrade/config/11.0_config.sql;FILEGROUP=proprietary_rildb_config_sql_files
vendor/etc/qcril_database/upgrade/config/12.0_config.sql;FILEGROUP=proprietary_rildb_config_sql_files
vendor/etc/qcril_database/upgrade/config/13.0_config.sql;FILEGROUP=proprietary_rildb_config_sql_files
vendor/etc/qcril_database/upgrade/config/14.0_config.sql;FILEGROUP=proprietary_rildb_config_sql_files
vendor/etc/qcril_database/upgrade/config/6.0_config.sql;FILEGROUP=proprietary_rildb_config_sql_files
vendor/etc/qcril_database/upgrade/config/7.0_config.sql;FILEGROUP=proprietary_rildb_config_sql_files
vendor/etc/qcril_database/upgrade/config/8.0_config.sql;FILEGROUP=proprietary_rildb_config_sql_files
vendor/etc/qcril_database/upgrade/config/9.0_config.sql;FILEGROUP=proprietary_rildb_config_sql_files
vendor/etc/qcril_database/upgrade/other/0_initial_qcrilnr.sql;FILEGROUP=proprietary_rildb_other_sql_files
vendor/etc/qcril_database/upgrade/other/10_version_update_ecc_table.sql;FILEGROUP=proprietary_rildb_other_sql_files
vendor/etc/qcril_database/upgrade/other/11_version_update_ecc_table.sql;FILEGROUP=proprietary_rildb_other_sql_files
vendor/etc/qcril_database/upgrade/other/12_version_update_ecc_table.sql;FILEGROUP=proprietary_rildb_other_sql_files
vendor/etc/qcril_database/upgrade/other/1_version_intro_qcrilnr.sql;FILEGROUP=proprietary_rildb_other_sql_files
vendor/etc/qcril_database/upgrade/other/2_version_add_wps_config_qcrilnr.sql;FILEGROUP=proprietary_rildb_other_sql_files
vendor/etc/qcril_database/upgrade/other/3_version_update_wps_config_qcrilnr.sql;FILEGROUP=proprietary_rildb_other_sql_files
vendor/etc/qcril_database/upgrade/other/4_version_update_ecc_table_qcrilnr.sql;FILEGROUP=proprietary_rildb_other_sql_files
vendor/etc/qcril_database/upgrade/other/5_version_update_ecc_table_qcrilnr.sql;FILEGROUP=proprietary_rildb_other_sql_files
vendor/etc/qcril_database/upgrade/other/6_version_change_property_table_qcrilnr.sql;FILEGROUP=proprietary_rildb_other_sql_files
vendor/etc/qcril_database/upgrade/other/7_version_update_ecc_table_qcrilnr.sql;FILEGROUP=proprietary_rildb_other_sql_files
vendor/etc/qcril_database/upgrade/other/8_version_update_ecc_table.sql;FILEGROUP=proprietary_rildb_other_sql_files
vendor/etc/qcril_database/upgrade/other/9_version_update_ecc_table.sql;FILEGROUP=proprietary_rildb_other_sql_files
vendor/etc/qcril_database/upgrade/config/10.0_config.sql
vendor/etc/qcril_database/upgrade/config/11.0_config.sql
vendor/etc/qcril_database/upgrade/config/12.0_config.sql
vendor/etc/qcril_database/upgrade/config/6.0_config.sql
vendor/etc/qcril_database/upgrade/config/7.0_config.sql
vendor/etc/qcril_database/upgrade/config/8.0_config.sql
vendor/etc/qcril_database/upgrade/config/9.0_config.sql
vendor/etc/qcril_database/upgrade/other/0_initial_qcrilnr.sql
vendor/etc/qcril_database/upgrade/other/10_version_update_ecc_table.sql
vendor/etc/qcril_database/upgrade/other/11_version_update_ecc_table.sql
vendor/etc/qcril_database/upgrade/other/12_version_update_ecc_table.sql
vendor/etc/qcril_database/upgrade/other/1_version_intro_qcrilnr.sql
vendor/etc/qcril_database/upgrade/other/2_version_add_wps_config_qcrilnr.sql
vendor/etc/qcril_database/upgrade/other/3_version_update_wps_config_qcrilnr.sql
vendor/etc/qcril_database/upgrade/other/4_version_update_ecc_table_qcrilnr.sql
vendor/etc/qcril_database/upgrade/other/5_version_update_ecc_table_qcrilnr.sql
vendor/etc/qcril_database/upgrade/other/6_version_change_property_table_qcrilnr.sql
vendor/etc/qcril_database/upgrade/other/7_version_update_ecc_table_qcrilnr.sql
vendor/etc/qcril_database/upgrade/other/8_version_update_ecc_table.sql
vendor/etc/qcril_database/upgrade/other/9_version_update_ecc_table.sql
vendor/etc/qcril_database/qcrilNr.db
vendor/etc/seccomp_policy/qcrilnr@2.0.policy
vendor/etc/ssg/ta_config.json
vendor/etc/ssg/tz_whitelist.json

View file

@ -1,37 +0,0 @@
//
// SPDX-FileCopyrightText: 2025 The LineageOS Project
// SPDX-License-Identifier: Apache-2.0
//
filegroup {
name: "rildb_config_sql_files",
srcs: [
"config/14.1_config.sql",
],
}
genrule {
name: "qcril_config_database",
enabled: true,
srcs: [
"//vendor/oneplus/dre:proprietary_rildb_other_sql_files",
"//vendor/oneplus/dre:proprietary_rildb_config_sql_files",
":rildb_config_sql_files",
],
tools: [
"generate_qcril_db",
],
cmd: "$(location generate_qcril_db) $(out) $(in)",
out: ["qcrilNr.db"],
}
prebuilt_etc {
name: "qcrilNrDb_vendor",
filename: "qcrilNr.db",
src: ":qcril_config_database",
relative_install_path: "qcril_database",
vendor: true,
required: [
"14.1_config.sql",
],
}

View file

@ -1,8 +0,0 @@
/*
Copyright (C) 2025 The LineageOS Project
SPDX-License-Identifier: Apache-2.0
*/
CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT PRIMARY KEY NOT NULL, def_val TEXT, value TEXT);
INSERT OR REPLACE INTO qcril_properties_table(property, def_val) VALUES('qcrildb_version',14.1);
UPDATE qcril_properties_table SET def_val="0" WHERE property="persist.vendor.radio.poweron_opt";

View file

@ -1,11 +0,0 @@
//
// SPDX-FileCopyrightText: 2025 The LineageOS Project
// SPDX-License-Identifier: Apache-2.0
//
prebuilt_etc {
name: "14.1_config.sql",
src: "14.1_config.sql",
relative_install_path: "qcril_database/upgrade/config",
vendor: true,
}