diff --git a/Android.bp b/Android.bp index 67094fd..67774d8 100644 --- a/Android.bp +++ b/Android.bp @@ -2865,56 +2865,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "android.hardware.camera.provider@2.4-legacy", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/android.hardware.camera.provider@2.4-legacy.so", - ], - shared_libs: [ - "libcamera_provider_shim", - "android.hardware.camera.common@1.0", - "android.hardware.camera.device@1.0", - "vendor.qti.hardware.camera.device@1.0", - "vendor.qti.hardware.camera.device@3.5", - "android.hardware.camera.device@3.2", - "android.hardware.camera.device@3.3", - "android.hardware.camera.device@3.4", - "android.hardware.camera.device@3.5", - "android.hardware.camera.provider@2.4", - "android.hardware.graphics.mapper@2.0", - "android.hardware.graphics.mapper@3.0", - "android.hardware.graphics.mapper@4.0", - "android.hidl.allocator@1.0", - "android.hidl.memory@1.0", - "camera.device@1.0-impl", - "camera.device@3.2-impl", - "camera.device@3.3-impl", - "camera.device@3.4-impl", - "camera.device@3.5-impl", - "libcamera_metadata", - "libcutils", - "libhardware", - "libhidlbase", - "liblog", - "libutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "com.qti.sensor.ofilm_hi259", owner: "xiaomi", @@ -7661,6 +7611,32 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libdisp-aba", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libdisp-aba.so", + ], + shared_libs: [ + "libcutils", + "liblog", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libdisplayqos", owner: "xiaomi", @@ -7743,6 +7719,40 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libdpps", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libdpps.so", + ], + shared_libs: [ + "libcutils", + "libdisp-aba", + "libqdutils", + "libutils", + "liblog", + "libbinder", + "libdrm", + "libtinyxml2-v34", + "libhidlbase", + "android.frameworks.sensorservice@1.0", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libdrmfs", owner: "xiaomi", @@ -11688,40 +11698,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "vendor.qti.hardware.camera.device@3.5", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/vendor.qti.hardware.camera.device@3.5.so", - ], - shared_libs: [ - "android.hardware.camera.common@1.0", - "android.hardware.camera.device@3.2", - "android.hardware.camera.device@3.3", - "android.hardware.camera.device@3.4", - "android.hardware.camera.device@3.5", - "android.hardware.graphics.common@1.0", - "libhidlbase", - "liblog", - "libutils", - "libcutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "vendor.qti.hardware.data.cne.internal.api@1.0", owner: "xiaomi", @@ -13389,7 +13365,7 @@ cc_prebuilt_library_shared { } prebuilt_rfsa { - name: "capi_v2_aptX_CLHDADV_Encoder", + name: "vendor_lib_rfsa_adsp_capi_v2_aptX_CLHDADV_Encoder_so", filename: "capi_v2_aptX_CLHDADV_Encoder.so", owner: "xiaomi", src: "proprietary/vendor/lib/rfsa/adsp/capi_v2_aptX_CLHDADV_Encoder.so", @@ -13398,7 +13374,7 @@ prebuilt_rfsa { } prebuilt_rfsa { - name: "capi_v2_aptX_CLHDAD_Speech_Decoder", + name: "vendor_lib_rfsa_adsp_capi_v2_aptX_CLHDAD_Speech_Decoder_so", filename: "capi_v2_aptX_CLHDAD_Speech_Decoder.so", owner: "xiaomi", src: "proprietary/vendor/lib/rfsa/adsp/capi_v2_aptX_CLHDAD_Speech_Decoder.so", @@ -13407,7 +13383,7 @@ prebuilt_rfsa { } prebuilt_rfsa { - name: "capi_v2_aptX_Classic", + name: "vendor_lib_rfsa_adsp_capi_v2_aptX_Classic_so", filename: "capi_v2_aptX_Classic.so", owner: "xiaomi", src: "proprietary/vendor/lib/rfsa/adsp/capi_v2_aptX_Classic.so", @@ -13416,7 +13392,7 @@ prebuilt_rfsa { } prebuilt_rfsa { - name: "capi_v2_aptX_HD", + name: "vendor_lib_rfsa_adsp_capi_v2_aptX_HD_so", filename: "capi_v2_aptX_HD.so", owner: "xiaomi", src: "proprietary/vendor/lib/rfsa/adsp/capi_v2_aptX_HD.so", @@ -13425,7 +13401,7 @@ prebuilt_rfsa { } prebuilt_rfsa { - name: "libSuperSensor_skel", + name: "vendor_lib_rfsa_adsp_libSuperSensor_skel_so", filename: "libSuperSensor_skel.so", owner: "xiaomi", src: "proprietary/vendor/lib/rfsa/adsp/libSuperSensor_skel.so", @@ -13434,7 +13410,7 @@ prebuilt_rfsa { } prebuilt_rfsa { - name: "libVC1Dec", + name: "vendor_lib_rfsa_adsp_libVC1Dec_so", filename: "libVC1Dec.so", owner: "xiaomi", src: "proprietary/vendor/lib/rfsa/adsp/libVC1Dec.so", @@ -13443,7 +13419,7 @@ prebuilt_rfsa { } prebuilt_rfsa { - name: "libVC1DecDsp_skel", + name: "vendor_lib_rfsa_adsp_libVC1DecDsp_skel_so", filename: "libVC1DecDsp_skel.so", owner: "xiaomi", src: "proprietary/vendor/lib/rfsa/adsp/libVC1DecDsp_skel.so", @@ -13452,7 +13428,7 @@ prebuilt_rfsa { } prebuilt_rfsa { - name: "libVDHexagonSuperPhoto_skel", + name: "vendor_lib_rfsa_adsp_libVDHexagonSuperPhoto_skel_so", filename: "libVDHexagonSuperPhoto_skel.so", owner: "xiaomi", src: "proprietary/vendor/lib/rfsa/adsp/libVDHexagonSuperPhoto_skel.so", @@ -13461,7 +13437,7 @@ prebuilt_rfsa { } prebuilt_rfsa { - name: "libapps_mem_heap", + name: "vendor_lib_rfsa_adsp_libapps_mem_heap_so", filename: "libapps_mem_heap.so", owner: "xiaomi", src: "proprietary/vendor/lib/rfsa/adsp/libapps_mem_heap.so", @@ -13470,7 +13446,7 @@ prebuilt_rfsa { } prebuilt_rfsa { - name: "libarcsoft_dualcam_refocus_skel", + name: "vendor_lib_rfsa_adsp_libarcsoft_dualcam_refocus_skel_so", filename: "libarcsoft_dualcam_refocus_skel.so", owner: "xiaomi", src: "proprietary/vendor/lib/rfsa/adsp/libarcsoft_dualcam_refocus_skel.so", @@ -13479,7 +13455,7 @@ prebuilt_rfsa { } prebuilt_rfsa { - name: "libcamera_nn_skel", + name: "vendor_lib_rfsa_adsp_libcamera_nn_skel_so", filename: "libcamera_nn_skel.so", owner: "xiaomi", src: "proprietary/vendor/lib/rfsa/adsp/libcamera_nn_skel.so", @@ -13488,7 +13464,7 @@ prebuilt_rfsa { } prebuilt_rfsa { - name: "libcvpdsp_skel", + name: "vendor_lib_rfsa_adsp_libcvpdsp_skel_so", filename: "libcvpdsp_skel.so", owner: "xiaomi", src: "proprietary/vendor/lib/rfsa/adsp/libcvpdsp_skel.so", @@ -13497,7 +13473,7 @@ prebuilt_rfsa { } prebuilt_rfsa { - name: "libdspCV_skel", + name: "vendor_lib_rfsa_adsp_libdspCV_skel_so", filename: "libdspCV_skel.so", owner: "xiaomi", src: "proprietary/vendor/lib/rfsa/adsp/libdspCV_skel.so", @@ -13506,7 +13482,7 @@ prebuilt_rfsa { } prebuilt_rfsa { - name: "libdsp_streamer_add_constant", + name: "vendor_lib_rfsa_adsp_libdsp_streamer_add_constant_so", filename: "libdsp_streamer_add_constant.so", owner: "xiaomi", src: "proprietary/vendor/lib/rfsa/adsp/libdsp_streamer_add_constant.so", @@ -13515,7 +13491,7 @@ prebuilt_rfsa { } prebuilt_rfsa { - name: "libdsp_streamer_binning", + name: "vendor_lib_rfsa_adsp_libdsp_streamer_binning_so", filename: "libdsp_streamer_binning.so", owner: "xiaomi", src: "proprietary/vendor/lib/rfsa/adsp/libdsp_streamer_binning.so", @@ -13524,7 +13500,7 @@ prebuilt_rfsa { } prebuilt_rfsa { - name: "libdsp_streamer_skel", + name: "vendor_lib_rfsa_adsp_libdsp_streamer_skel_so", filename: "libdsp_streamer_skel.so", owner: "xiaomi", src: "proprietary/vendor/lib/rfsa/adsp/libdsp_streamer_skel.so", @@ -13533,7 +13509,7 @@ prebuilt_rfsa { } prebuilt_rfsa { - name: "libfastcvadsp", + name: "vendor_lib_rfsa_adsp_libfastcvadsp_so", filename: "libfastcvadsp.so", owner: "xiaomi", src: "proprietary/vendor/lib/rfsa/adsp/libfastcvadsp.so", @@ -13542,7 +13518,7 @@ prebuilt_rfsa { } prebuilt_rfsa { - name: "libfastcvdsp_skel", + name: "vendor_lib_rfsa_adsp_libfastcvdsp_skel_so", filename: "libfastcvdsp_skel.so", owner: "xiaomi", src: "proprietary/vendor/lib/rfsa/adsp/libfastcvdsp_skel.so", @@ -13551,7 +13527,7 @@ prebuilt_rfsa { } prebuilt_rfsa { - name: "libhexagon_nn_skel", + name: "vendor_lib_rfsa_adsp_libhexagon_nn_skel_so", filename: "libhexagon_nn_skel.so", owner: "xiaomi", src: "proprietary/vendor/lib/rfsa/adsp/libhexagon_nn_skel.so", @@ -13560,7 +13536,7 @@ prebuilt_rfsa { } prebuilt_rfsa { - name: "libhexagon_nn_skel_secondary", + name: "vendor_lib_rfsa_adsp_libhexagon_nn_skel_secondary_so", filename: "libhexagon_nn_skel_secondary.so", owner: "xiaomi", src: "proprietary/vendor/lib/rfsa/adsp/libhexagon_nn_skel_secondary.so", @@ -13569,7 +13545,7 @@ prebuilt_rfsa { } prebuilt_rfsa { - name: "libscveObjectSegmentation_skel", + name: "vendor_lib_rfsa_adsp_libscveObjectSegmentation_skel_so", filename: "libscveObjectSegmentation_skel.so", owner: "xiaomi", src: "proprietary/vendor/lib/rfsa/adsp/libscveObjectSegmentation_skel.so", @@ -13578,7 +13554,7 @@ prebuilt_rfsa { } prebuilt_rfsa { - name: "libscveT2T_skel", + name: "vendor_lib_rfsa_adsp_libscveT2T_skel_so", filename: "libscveT2T_skel.so", owner: "xiaomi", src: "proprietary/vendor/lib/rfsa/adsp/libscveT2T_skel.so", @@ -13587,7 +13563,7 @@ prebuilt_rfsa { } prebuilt_rfsa { - name: "libsnpe_dsp_v66_domains_v2_skel", + name: "vendor_lib_rfsa_adsp_libsnpe_dsp_v66_domains_v2_skel_so", filename: "libsnpe_dsp_v66_domains_v2_skel.so", owner: "xiaomi", src: "proprietary/vendor/lib/rfsa/adsp/libsnpe_dsp_v66_domains_v2_skel.so", @@ -13596,7 +13572,7 @@ prebuilt_rfsa { } prebuilt_rfsa { - name: "libsns_device_mode_skel", + name: "vendor_lib_rfsa_adsp_libsns_device_mode_skel_so", filename: "libsns_device_mode_skel.so", owner: "xiaomi", src: "proprietary/vendor/lib/rfsa/adsp/libsns_device_mode_skel.so", @@ -13605,7 +13581,7 @@ prebuilt_rfsa { } prebuilt_rfsa { - name: "libsns_low_lat_stream_skel", + name: "vendor_lib_rfsa_adsp_libsns_low_lat_stream_skel_so", filename: "libsns_low_lat_stream_skel.so", owner: "xiaomi", src: "proprietary/vendor/lib/rfsa/adsp/libsns_low_lat_stream_skel.so", @@ -13614,7 +13590,7 @@ prebuilt_rfsa { } prebuilt_rfsa { - name: "misound_res", + name: "vendor_lib_rfsa_adsp_misound_res_bin", filename: "misound_res.bin", owner: "xiaomi", src: "proprietary/vendor/lib/rfsa/adsp/misound_res.bin", @@ -13623,7 +13599,7 @@ prebuilt_rfsa { } prebuilt_rfsa { - name: "tas25xx_TI_0", + name: "vendor_lib_rfsa_adsp_tas25xx_TI_0_bin", filename: "tas25xx_TI_0.bin", owner: "xiaomi", src: "proprietary/vendor/lib/rfsa/adsp/tas25xx_TI_0.bin", @@ -13632,7 +13608,7 @@ prebuilt_rfsa { } prebuilt_rfsa { - name: "tas25xx_TI_1", + name: "vendor_lib_rfsa_adsp_tas25xx_TI_1_bin", filename: "tas25xx_TI_1.bin", owner: "xiaomi", src: "proprietary/vendor/lib/rfsa/adsp/tas25xx_TI_1.bin", diff --git a/proprietary/vendor/lib64/android.hardware.camera.provider@2.4-legacy.so b/proprietary/vendor/lib64/android.hardware.camera.provider@2.4-legacy.so deleted file mode 100644 index c7be376..0000000 Binary files a/proprietary/vendor/lib64/android.hardware.camera.provider@2.4-legacy.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libdisp-aba.so b/proprietary/vendor/lib64/libdisp-aba.so new file mode 100644 index 0000000..e293f5d Binary files /dev/null and b/proprietary/vendor/lib64/libdisp-aba.so differ diff --git a/proprietary/vendor/lib64/libdpps.so b/proprietary/vendor/lib64/libdpps.so new file mode 100644 index 0000000..84134f1 Binary files /dev/null and b/proprietary/vendor/lib64/libdpps.so differ diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.camera.device@3.5.so b/proprietary/vendor/lib64/vendor.qti.hardware.camera.device@3.5.so deleted file mode 100644 index 86cfe1f..0000000 Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.camera.device@3.5.so and /dev/null differ diff --git a/surya-vendor.mk b/surya-vendor.mk index 0f8c40d..21f4280 100644 --- a/surya-vendor.mk +++ b/surya-vendor.mk @@ -346,7 +346,6 @@ PRODUCT_PACKAGES += \ libvppclient \ libasphere \ libshoebox \ - android.hardware.camera.provider@2.4-legacy \ com.qti.sensor.ofilm_hi259 \ com.qti.sensor.ofilm_imx682 \ com.qti.sensor.ofilm_ov02b1b \ @@ -505,9 +504,11 @@ PRODUCT_PACKAGES += \ libconfigdb \ libcpion \ libdataitems \ + libdisp-aba \ libdisplayqos \ libdng_sdk2vendor \ libdpmqmihal \ + libdpps \ libdrmfs \ libdrmtime \ libdsi_netctrl \ @@ -641,7 +642,6 @@ PRODUCT_PACKAGES += \ vendor.qti.hardware.bluetooth_sar@1.0 \ vendor.qti.hardware.bluetooth_sar@1.1 \ vendor.qti.hardware.cacert@1.0 \ - vendor.qti.hardware.camera.device@3.5 \ vendor.qti.hardware.data.cne.internal.api@1.0 \ vendor.qti.hardware.data.cne.internal.constants@1.0 \ vendor.qti.hardware.data.cne.internal.server@1.0 \ @@ -698,34 +698,34 @@ PRODUCT_PACKAGES += \ vendor.qti.imsrtpservice@3.0_vendor \ vendor.qti.latency@2.0 \ vendor.qti.latency@2.1 \ - capi_v2_aptX_CLHDADV_Encoder \ - capi_v2_aptX_CLHDAD_Speech_Decoder \ - capi_v2_aptX_Classic \ - capi_v2_aptX_HD \ - libSuperSensor_skel \ - libVC1Dec \ - libVC1DecDsp_skel \ - libVDHexagonSuperPhoto_skel \ - libapps_mem_heap \ - libarcsoft_dualcam_refocus_skel \ - libcamera_nn_skel \ - libcvpdsp_skel \ - libdspCV_skel \ - libdsp_streamer_add_constant \ - libdsp_streamer_binning \ - libdsp_streamer_skel \ - libfastcvadsp \ - libfastcvdsp_skel \ - libhexagon_nn_skel \ - libhexagon_nn_skel_secondary \ - libscveObjectSegmentation_skel \ - libscveT2T_skel \ - libsnpe_dsp_v66_domains_v2_skel \ - libsns_device_mode_skel \ - libsns_low_lat_stream_skel \ - misound_res \ - tas25xx_TI_0 \ - tas25xx_TI_1 \ + vendor_lib_rfsa_adsp_capi_v2_aptX_CLHDADV_Encoder_so \ + vendor_lib_rfsa_adsp_capi_v2_aptX_CLHDAD_Speech_Decoder_so \ + vendor_lib_rfsa_adsp_capi_v2_aptX_Classic_so \ + vendor_lib_rfsa_adsp_capi_v2_aptX_HD_so \ + vendor_lib_rfsa_adsp_libSuperSensor_skel_so \ + vendor_lib_rfsa_adsp_libVC1Dec_so \ + vendor_lib_rfsa_adsp_libVC1DecDsp_skel_so \ + vendor_lib_rfsa_adsp_libVDHexagonSuperPhoto_skel_so \ + vendor_lib_rfsa_adsp_libapps_mem_heap_so \ + vendor_lib_rfsa_adsp_libarcsoft_dualcam_refocus_skel_so \ + vendor_lib_rfsa_adsp_libcamera_nn_skel_so \ + vendor_lib_rfsa_adsp_libcvpdsp_skel_so \ + vendor_lib_rfsa_adsp_libdspCV_skel_so \ + vendor_lib_rfsa_adsp_libdsp_streamer_add_constant_so \ + vendor_lib_rfsa_adsp_libdsp_streamer_binning_so \ + vendor_lib_rfsa_adsp_libdsp_streamer_skel_so \ + vendor_lib_rfsa_adsp_libfastcvadsp_so \ + vendor_lib_rfsa_adsp_libfastcvdsp_skel_so \ + vendor_lib_rfsa_adsp_libhexagon_nn_skel_so \ + vendor_lib_rfsa_adsp_libhexagon_nn_skel_secondary_so \ + vendor_lib_rfsa_adsp_libscveObjectSegmentation_skel_so \ + vendor_lib_rfsa_adsp_libscveT2T_skel_so \ + vendor_lib_rfsa_adsp_libsnpe_dsp_v66_domains_v2_skel_so \ + vendor_lib_rfsa_adsp_libsns_device_mode_skel_so \ + vendor_lib_rfsa_adsp_libsns_low_lat_stream_skel_so \ + vendor_lib_rfsa_adsp_misound_res_bin \ + vendor_lib_rfsa_adsp_tas25xx_TI_0_bin \ + vendor_lib_rfsa_adsp_tas25xx_TI_1_bin \ com.qualcomm.qti.dpm.api@1.0 \ fm_helium \ lib-imsvideocodec \