diff --git a/Android.bp b/Android.bp index 00c2a48..1d3b855 100644 --- a/Android.bp +++ b/Android.bp @@ -5757,6 +5757,60 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libjpegdecoder_prebuilt", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libjpegdecoder_prebuilt.so", + ], + shared_libs: [ + "libjpeg", + "liblog", + "libutils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libjpegencoder_prebuilt", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libjpegencoder_prebuilt.so", + ], + shared_libs: [ + "libjpeg", + "liblog", + "libutils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libkaraokepal", owner: "xiaomi", @@ -12877,6 +12931,36 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libultrahdr_prebuilt", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libultrahdr_prebuilt.so", + ], + shared_libs: [ + "libimage_io", + "libjpeg", + "libjpegencoder_prebuilt", + "libjpegdecoder_prebuilt", + "liblog", + "libutils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libultrasound_notify", owner: "xiaomi", @@ -26721,7 +26805,7 @@ cc_prebuilt_library_shared { "libcom.xiaomi.pluginutils", "libcom.xiaomi.metadatautils", "libcom.xiaomi.debug", - "libultrahdr", + "libultrahdr_prebuilt", "libjpeg", "libc++", "libc", @@ -26731,7 +26815,6 @@ cc_prebuilt_library_shared { }, }, compile_multilib: "64", - check_elf_files: false, relative_install_path: "camera/plugins", prefer: true, device_specific: true, @@ -26828,7 +26911,7 @@ cc_prebuilt_library_shared { "libjpeg", "libexif", "libimage_io", - "libultrahdr", + "libultrahdr_prebuilt", "libc++", "libc", "libm", @@ -26837,7 +26920,6 @@ cc_prebuilt_library_shared { }, }, compile_multilib: "64", - check_elf_files: false, relative_install_path: "camera/plugins", prefer: true, device_specific: true, diff --git a/peridot-vendor.mk b/peridot-vendor.mk index 8120866..0ec53c7 100644 --- a/peridot-vendor.mk +++ b/peridot-vendor.mk @@ -1245,6 +1245,8 @@ PRODUCT_PACKAGES += \ libizat_client_api \ libizat_core \ libjnihelper \ + libjpegdecoder_prebuilt \ + libjpegencoder_prebuilt \ libkaraokepal \ libkcl \ libkernelmanager \ @@ -1482,6 +1484,7 @@ PRODUCT_PACKAGES += \ libtlpd_logger \ libtrustedapploader \ libubwcp \ + libultrahdr_prebuilt \ libultrasound_notify \ libvideodiedobserver_vendor \ libvideotxr \ diff --git a/proprietary/odm/lib64/camera/plugins/com.xiaomi.plugin.gainmap.so b/proprietary/odm/lib64/camera/plugins/com.xiaomi.plugin.gainmap.so index 2a04997..5abf119 100644 Binary files a/proprietary/odm/lib64/camera/plugins/com.xiaomi.plugin.gainmap.so and b/proprietary/odm/lib64/camera/plugins/com.xiaomi.plugin.gainmap.so differ diff --git a/proprietary/odm/lib64/camera/plugins/com.xiaomi.plugin.jpegrAggr.so b/proprietary/odm/lib64/camera/plugins/com.xiaomi.plugin.jpegrAggr.so index 8f86f9f..139c54a 100644 Binary files a/proprietary/odm/lib64/camera/plugins/com.xiaomi.plugin.jpegrAggr.so and b/proprietary/odm/lib64/camera/plugins/com.xiaomi.plugin.jpegrAggr.so differ diff --git a/proprietary/vendor/lib64/libjpegdecoder_prebuilt.so b/proprietary/vendor/lib64/libjpegdecoder_prebuilt.so new file mode 100644 index 0000000..a0250f1 Binary files /dev/null and b/proprietary/vendor/lib64/libjpegdecoder_prebuilt.so differ diff --git a/proprietary/vendor/lib64/libjpegencoder_prebuilt.so b/proprietary/vendor/lib64/libjpegencoder_prebuilt.so new file mode 100644 index 0000000..34d2ee7 Binary files /dev/null and b/proprietary/vendor/lib64/libjpegencoder_prebuilt.so differ diff --git a/proprietary/vendor/lib64/libultrahdr_prebuilt.so b/proprietary/vendor/lib64/libultrahdr_prebuilt.so new file mode 100644 index 0000000..10a4a30 Binary files /dev/null and b/proprietary/vendor/lib64/libultrahdr_prebuilt.so differ