From 1008a7e64b3954f766dcee58920aff52d9fa6088 Mon Sep 17 00:00:00 2001 From: SGCMarkus Date: Sun, 7 Aug 2022 15:26:29 +0200 Subject: [PATCH] sm7325-common: build more blobs from source includes: *) com.dsi.ant@1.0 *) vendor.qti.hardware.btconfigstore@1.0 *) vendor.qti.hardware.btconfigstore@2.0 *) vendor.qti.hardware.display.composer-service *) libdisplayconfig.qti *) libsdmcore *) libsdmutils *) libsdedrm *) libqsap_sdk *) vendor.qti.hardware.systemhelper@1.0 Change-Id: Ica20d37094b0528f0b3984f0500f17f6f253b14f --- proprietary-files.txt | 12 ------- rootdir/etc/init/init.qti.display_boot.rc | 38 ----------------------- sm7325.mk | 15 ++++++--- 3 files changed, 11 insertions(+), 54 deletions(-) delete mode 100644 rootdir/etc/init/init.qti.display_boot.rc diff --git a/proprietary-files.txt b/proprietary-files.txt index b93be5e..a789e5d 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -56,7 +56,6 @@ vendor/lib64/rfsa/adsp/libsns_low_lat_stream_skel.so system_ext/lib/com.qualcomm.qti.ant@1.0.so system_ext/lib64/com.qualcomm.qti.ant@1.0.so vendor/lib64/hw/com.dsi.ant@1.0-impl.so -vendor/lib64/com.dsi.ant@1.0.so # Audio libraries vendor/etc/maxx_conf.ini @@ -114,8 +113,6 @@ vendor/lib/btaudio_offload_if.so vendor/lib/libbluetooth_audio_session_qti.so vendor/lib/vendor.qti.hardware.bluetooth_sar@1.0.so vendor/lib/vendor.qti.hardware.bluetooth_sar@1.1.so -vendor/lib/vendor.qti.hardware.btconfigstore@1.0.so -vendor/lib/vendor.qti.hardware.btconfigstore@2.0.so vendor/lib64/hw/audio.bluetooth_qti.default.so vendor/lib64/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so @@ -125,8 +122,6 @@ vendor/lib64/btaudio_offload_if.so vendor/lib64/libbluetooth_audio_session_qti.so vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.1.so -vendor/lib64/vendor.qti.hardware.btconfigstore@1.0.so -vendor/lib64/vendor.qti.hardware.btconfigstore@2.0.so # Bluetooth (aptX) lib64/libaptX_encoder.so @@ -280,17 +275,13 @@ vendor/etc/hdr_tm_config.xml vendor/lib64/libhdr_tm.so # Display - HWC -vendor/bin/hw/vendor.qti.hardware.display.composer-service vendor/bin/qdcmss vendor/etc/init/qdcmss.rc vendor/etc/snapdragon_color_libs_config.xml -vendor/lib64/libdisplayconfig.qti.so vendor/lib64/libdpps.so vendor/lib64/libhdrdynamic.so vendor/lib64/libhdrdynamicootf.so vendor/lib64/libqdcm-mode-parser.so -vendor/lib64/libsdmcore.so -vendor/lib64/libsdmutils.so vendor/lib64/libsnapdragoncolor-manager.so vendor/lib64/libsnapdragoncolor-qdcm.so @@ -304,7 +295,6 @@ vendor/lib64/libdisplayqos.so vendor/lib64/libdisplayskuutils.so vendor/lib64/libqseed3.so vendor/lib64/librcmask.so -vendor/lib64/libsdedrm.so vendor/lib64/libsdm-color.so vendor/lib64/libsdm-colormgr-algo.so vendor/lib64/libsdm-diag.so @@ -883,7 +873,6 @@ vendor/lib64/libqcrilNrQtiMutex.so vendor/lib64/libqmimotext.so vendor/lib64/libqrtr.so vendor/lib64/libqrtrclient.so -vendor/lib64/libqsap_sdk.so vendor/lib64/libqsocket.so vendor/lib64/libril-db.so vendor/lib64/libril-qc-ltedirectdisc.so @@ -1066,7 +1055,6 @@ vendor/lib64/libTrustedUI.so vendor/lib64/libTrustedUITZ.so vendor/lib64/libTrustedUIVM.so vendor/lib64/libtrustedapploader.so -vendor/lib64/vendor.qti.hardware.systemhelper@1.0.so vendor/lib64/vendor.qti.hardware.trustedui@1.0.so vendor/lib64/vendor.qti.hardware.trustedui@1.1.so vendor/lib64/vendor.qti.hardware.trustedui@1.2.so diff --git a/rootdir/etc/init/init.qti.display_boot.rc b/rootdir/etc/init/init.qti.display_boot.rc deleted file mode 100644 index 998fe49..0000000 --- a/rootdir/etc/init/init.qti.display_boot.rc +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright (c) 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, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -service qti_display_boot /vendor/bin/init.qti.display_boot.sh - class main - user system - group system - disabled - oneshot - -on post-fs-data - start qti_display_boot - diff --git a/sm7325.mk b/sm7325.mk index 63ba71b..a54f2e5 100644 --- a/sm7325.mk +++ b/sm7325.mk @@ -73,6 +73,10 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES_DEBUG += \ bootctl +# Ant +PRODUCT_PACKAGES += \ + com.dsi.ant@1.0.vendor + # Atrace PRODUCT_PACKAGES += \ android.hardware.atrace@1.0-service @@ -135,6 +139,7 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ android.hardware.camera.provider@2.4-impl \ android.hardware.camera.provider@2.4-service_64 \ + libcamera2ndk_vendor \ libgui_vendor \ vendor.qti.hardware.camera.postproc@1.0.vendor @@ -149,6 +154,7 @@ PRODUCT_PACKAGES += \ android.hardware.graphics.mapper@4.0-impl-qti-display \ android.hardware.memtrack@1.0-impl \ android.hardware.memtrack@1.0-service \ + init.qti.display_boot.rc \ init.qti.display_boot.sh \ gralloc.default \ libdisplayconfig.qti \ @@ -220,10 +226,6 @@ PRODUCT_PACKAGES += \ libhidltransport.vendor \ libhwbinder.vendor -PRODUCT_COPY_FILES += \ - prebuilts/vndk/v30/arm64/arch-arm-armv8-a/shared/vndk-core/android.hidl.memory.block@1.0.so:vendor/lib/android.hidl.memory.block@1.0.so \ - prebuilts/vndk/v30/arm64/arch-arm64-armv8-a/shared/vndk-core/android.hidl.memory.block@1.0.so:vendor/lib64/android.hidl.memory.block@1.0.so - # Init PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/rootdir/etc/fstab.qcom:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/first_stage_ramdisk/fstab.qcom @@ -464,6 +466,11 @@ PRODUCT_PACKAGES += \ android.hardware.thermal@2.0 \ android.hardware.thermal@2.0.vendor +# Trusted UI +PRODUCT_PACKAGES += \ + android.hidl.memory.block@1.0.vendor \ + vendor.qti.hardware.systemhelper@1.0.vendor + # Update engine PRODUCT_PACKAGES += \ update_engine \