diff --git a/Android.bp b/Android.bp index 98f8ed3..5fa724f 100644 --- a/Android.bp +++ b/Android.bp @@ -1903,49 +1903,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libcamxexternalformatutils", - owner: "nothing", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: [ - "proprietary/vendor/lib/libcamxexternalformatutils.so", - ], - shared_libs: [ - "libcutils", - "liblog", - "libsync", - "libc++", - "libz", - "libc", - "libm", - "libdl", - ], - }, - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libcamxexternalformatutils.so", - ], - shared_libs: [ - "libcutils", - "liblog", - "libsync", - "libc++", - "libz", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "both", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libcapiv2svacnn", owner: "nothing", @@ -3744,6 +3701,35 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libmpbase", + owner: "nothing", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: [ + "proprietary/vendor/lib/libmpbase.so", + ], + shared_libs: [ + "libc", + ], + }, + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libmpbase.so", + ], + shared_libs: [ + "libc", + ], + }, + }, + compile_multilib: "both", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libmulawdec", owner: "nothing", @@ -14022,6 +14008,34 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libcamxexternalformatutils", + owner: "nothing", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libcamxexternalformatutils.so", + ], + shared_libs: [ + "libcutils", + "liblog", + "libsync", + "libc++", + "libz", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libcamxfacialfeatures", owner: "nothing", @@ -14600,33 +14614,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libcvp_util", - owner: "nothing", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libcvp_util.so", - ], - shared_libs: [ - "libc++", - "libutils", - "libQSEEComAPI", - "liblog", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libcvpcpuRev_skel", owner: "nothing", @@ -16272,10 +16259,14 @@ cc_prebuilt_library_shared { target: { android_arm64: { srcs: [ - "proprietary/vendor/lib64/libmpbase.so", + "proprietary/vendor/lib64/libmouth_mask_detection.arcsoft.so", ], shared_libs: [ + "libmpbase", + "liblog", "libc", + "libm", + "libdl", ], }, }, diff --git a/Spacewar-vendor.mk b/Spacewar-vendor.mk index 45de501..2535e06 100644 --- a/Spacewar-vendor.mk +++ b/Spacewar-vendor.mk @@ -8,6 +8,7 @@ PRODUCT_SOONG_NAMESPACES += \ PRODUCT_COPY_FILES += \ vendor/nothing/Spacewar/proprietary/odm/etc/aac_richtap.config:$(TARGET_COPY_OUT_ODM)/etc/aac_richtap.config \ vendor/nothing/Spacewar/proprietary/product/etc/permissions/telephony_product_privapp-permissions-qti.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/telephony_product_privapp-permissions-qti.xml \ + vendor/nothing/Spacewar/proprietary/system/etc/public.libraries.txt:$(TARGET_COPY_OUT_SYSTEM)/etc/public.libraries.txt \ vendor/nothing/Spacewar/proprietary/system/etc/sysconfig/qti_whitelist.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/qti_whitelist.xml \ vendor/nothing/Spacewar/proprietary/system_ext/etc/dpm/dpm.conf:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/dpm/dpm.conf \ vendor/nothing/Spacewar/proprietary/system_ext/etc/hdr_config/ans_off/ans_config.txt:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/hdr_config/ans_off/ans_config.txt \ @@ -214,6 +215,7 @@ PRODUCT_COPY_FILES += \ vendor/nothing/Spacewar/proprietary/vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.bluetooth@1.0-service-qti.rc \ vendor/nothing/Spacewar/proprietary/vendor/etc/init/android.hardware.camera.provider@2.4-service_64.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.camera.provider@2.4-service_64.rc \ vendor/nothing/Spacewar/proprietary/vendor/etc/init/android.hardware.drm@1.3-service.widevine.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.drm@1.3-service.widevine.rc \ + vendor/nothing/Spacewar/proprietary/vendor/etc/init/android.hardware.camera.provider@2.4-service_64.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.camera.provider@2.4-service_64.rc \ vendor/nothing/Spacewar/proprietary/vendor/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc \ vendor/nothing/Spacewar/proprietary/vendor/etc/init/android.hardware.gnss@2.1-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.gnss@2.1-service-qti.rc \ vendor/nothing/Spacewar/proprietary/vendor/etc/init/android.hardware.keymaster@4.1-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.keymaster@4.1-service-qti.rc \ @@ -315,6 +317,7 @@ PRODUCT_COPY_FILES += \ vendor/nothing/Spacewar/proprietary/vendor/etc/mixer_paths_qrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_qrd.xml \ vendor/nothing/Spacewar/proprietary/vendor/etc/msm_irqbalance.conf:$(TARGET_COPY_OUT_VENDOR)/etc/msm_irqbalance.conf \ vendor/nothing/Spacewar/proprietary/vendor/etc/permissions/vendor-qti-hardware-sensorscalibrate.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/vendor-qti-hardware-sensorscalibrate.xml \ + vendor/nothing/Spacewar/proprietary/vendor/etc/public.libraries.txt:$(TARGET_COPY_OUT_VENDOR)/etc/public.libraries.txt \ vendor/nothing/Spacewar/proprietary/vendor/etc/qcril_database/qcrilNr.db:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/qcrilNr.db \ vendor/nothing/Spacewar/proprietary/vendor/etc/qcril_database/upgrade/config/10.0_config.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/config/10.0_config.sql \ vendor/nothing/Spacewar/proprietary/vendor/etc/qcril_database/upgrade/config/11.0_config.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/config/11.0_config.sql \ @@ -542,7 +545,6 @@ PRODUCT_PACKAGES += \ libbt-hidlclient \ libbtnv \ libc2d30_bltlib \ - libcamxexternalformatutils \ libcapiv2svacnn \ libcapiv2svarnn \ libcapiv2vop \ @@ -586,6 +588,7 @@ PRODUCT_PACKAGES += \ libminksocket \ libmiracast \ libmmosal_vendor \ + libmpbase \ libmulawdec \ libnetmgr \ libqc2vppfilter \ @@ -847,6 +850,7 @@ PRODUCT_PACKAGES += \ libcamera_nn_stub \ libcamerapostproc \ libcamxextension_night \ + libcamxexternalformatutils \ libcamxfacialfeatures \ libcamxfdalgo \ libcamxfdengine \ @@ -864,7 +868,6 @@ PRODUCT_PACKAGES += \ libcneqmiutils \ libcom.qti.chinodeutils \ libcpion \ - libcvp_util \ libcvpcpuRev_skel \ libdataitems \ libdepthcomputation \ diff --git a/proprietary/system/etc/public.libraries.txt b/proprietary/system/etc/public.libraries.txt new file mode 100644 index 0000000..3625b59 --- /dev/null +++ b/proprietary/system/etc/public.libraries.txt @@ -0,0 +1,33 @@ +# See https://android.googlesource.com/platform/ndk/+/main/docs/PlatformApis.md +libandroid.so +libaaudio.so +libamidi.so +libbinder_ndk.so +libc.so +libcamera2ndk.so +libclang_rt.hwasan-aarch64-android.so 64 nopreload +libdl.so +libEGL.so +libGLESv1_CM.so +libGLESv2.so +libGLESv3.so +libicu.so +libicui18n.so +libicuuc.so +libjnigraphics.so +liblog.so +libmediandk.so +libm.so +libnativehelper.so +libnativewindow.so +libneuralnetworks.so nopreload +libOpenMAXAL.so +libOpenSLES.so +libRS.so +libstdc++.so +libsync.so +libvulkan.so +libwebviewchromium_plat_support.so +libz.so +libofflineproc_jni.so +libencoderjpeg_jni.so nopreload diff --git a/proprietary/vendor/etc/init/android.hardware.camera.provider@2.4-service_64.rc b/proprietary/vendor/etc/init/android.hardware.camera.provider@2.4-service_64.rc new file mode 100644 index 0000000..5cd1d55 --- /dev/null +++ b/proprietary/vendor/etc/init/android.hardware.camera.provider@2.4-service_64.rc @@ -0,0 +1,28 @@ +#! /bin/sh +# +#Copyright (c) 2019-2021 Qualcomm Technologies, Inc. +#All Rights Reserved. +#Confidential and Proprietary - Qualcomm Technologies, Inc. +# + +on property:sys.boot_completed=1 + setprop camera.disable_zsl_mode true + # Add a cpuset for the camera daemon + # We want all cores for camera + mkdir /dev/cpuset/camera-daemon + write /dev/cpuset/camera-daemon/cpus 0-7 + write /dev/cpuset/camera-daemon/mems 0 + chown cameraserver cameraserver /dev/cpuset/camera-daemon + chown cameraserver cameraserver /dev/cpuset/camera-daemon/tasks + chmod 0660 /dev/cpuset/camera-daemon/tasks + +service vendor.camera-provider-2-4 /vendor/bin/hw/android.hardware.camera.provider@2.4-service_64 + override + interface android.hardware.camera.provider@2.4::ICameraProvider legacy/0 + interface vendor.qti.hardware.camera.postproc@1.0::IPostProcService camerapostprocservice + class hal + user cameraserver + group audio camera input drmrpc oem_2907 + ioprio rt 4 + capabilities SYS_NICE + task_profiles CameraServiceCapacity HighPerformance diff --git a/proprietary/vendor/etc/public.libraries.txt b/proprietary/vendor/etc/public.libraries.txt new file mode 100644 index 0000000..8c8ece1 --- /dev/null +++ b/proprietary/vendor/etc/public.libraries.txt @@ -0,0 +1,17 @@ +libOpenCL.so +libcamxextension_night.so 64 +libarcsoft_beautyshot.so 64 +libarcsoft_aiscenedetection.so 64 +libarcsoft_portrait_distortion_correction.so 64 +libarcsoft_low_light_hdr.so 64 +libmouth_mask_detection.arcsoft.so 64 +libarcsoft_superportrait.so 64 +libarcsoft_watermark.so 64 +libarcsoft_portrait_super_night_raw.so 64 +libarcsoft_super_night_raw.so 64 +libarcsoft_dark_vision_raw.so 64 +libarcsoft_singlecam_bokeh.so 64 +libarcsoft_high_dynamic_range.so 64 +libarcsoft_dualcam_refocus_image.so 64 +libarcsoft_dualcam_refocus_video.so 64 +libarcsoft_mf_superresolution.so 64 \ No newline at end of file diff --git a/proprietary/vendor/lib/libcamxexternalformatutils.so b/proprietary/vendor/lib/libcamxexternalformatutils.so deleted file mode 100644 index f65dcad..0000000 Binary files a/proprietary/vendor/lib/libcamxexternalformatutils.so and /dev/null differ diff --git a/proprietary/vendor/lib/libmpbase.so b/proprietary/vendor/lib/libmpbase.so new file mode 100644 index 0000000..1350a49 Binary files /dev/null and b/proprietary/vendor/lib/libmpbase.so differ diff --git a/proprietary/vendor/lib64/libcvp_util.so b/proprietary/vendor/lib64/libcvp_util.so deleted file mode 100644 index 5c7df78..0000000 Binary files a/proprietary/vendor/lib64/libcvp_util.so and /dev/null differ