diff --git a/Aerodactyl-vendor.mk b/Aerodactyl-vendor.mk index e9c1e8c..7a3916a 100644 --- a/Aerodactyl-vendor.mk +++ b/Aerodactyl-vendor.mk @@ -462,7 +462,6 @@ PRODUCT_PACKAGES += \ hwcomposer.mtk_common \ libMcGatekeeper \ libSoftGatekeeper \ - android.hardware.camera.provider@2.6-impl-mediatek \ android.hardware.graphics.allocator@4.0-impl-mediatek \ android.hardware.graphics.mapper@4.0-impl-mediatek \ gralloc.common \ @@ -1026,10 +1025,6 @@ PRODUCT_PACKAGES += \ libmtkcam_hal_custom_provider \ libmtkcam_hal_custom_state \ libmtkcam_hal_custom_utils \ - libmtkcam_hal_hidl_common \ - libmtkcam_hal_hidl_device \ - libmtkcam_hal_hidl_provider \ - libmtkcam_hal_hidl_utils \ libmtkcam_hwnode \ libmtkcam_hwutils \ libmtkcam_hwutils_android \ @@ -1323,7 +1318,6 @@ PRODUCT_PACKAGES += \ vendor_lib64_hw_audio_r_submix_mt6886_so \ vendor_lib64_hw_gatekeeper_trustonic_so \ vendor_lib64_hw_gatekeeper_default_so \ - vendor_lib64_hw_android_hardware_camera_provider@2_6-impl-mediatek_so \ vendor_lib64_hw_android_hardware_graphics_allocator@4_0-impl-mediatek_so \ vendor_lib64_hw_android_hardware_graphics_mapper@4_0-impl-mediatek_so \ vendor_lib64_hw_gralloc_common_so \ @@ -1603,10 +1597,6 @@ PRODUCT_PACKAGES += \ vendor_lib64_libmtkcam_hal_custom_provider_so \ vendor_lib64_libmtkcam_hal_custom_state_so \ vendor_lib64_libmtkcam_hal_custom_utils_so \ - vendor_lib64_libmtkcam_hal_hidl_common_so \ - vendor_lib64_libmtkcam_hal_hidl_device_so \ - vendor_lib64_libmtkcam_hal_hidl_provider_so \ - vendor_lib64_libmtkcam_hal_hidl_utils_so \ vendor_lib64_libmtkcam_hwnode_so \ vendor_lib64_libmtkcam_hwutils_so \ vendor_lib64_libmtkcam_hwutils_android_so \ diff --git a/Android.bp b/Android.bp index 832ec48..61be6a3 100644 --- a/Android.bp +++ b/Android.bp @@ -1294,41 +1294,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "android.hardware.camera.provider@2.6-impl-mediatek", - owner: "nothing", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/hw/mt6886/android.hardware.camera.provider@2.6-impl-mediatek.so", - ], - shared_libs: [ - "libmtkcam_hal_hidl_provider", - "libmtkcam_hal_hidl_device", - "liblog", - "libutils", - "libcutils", - "android.hardware.camera.common@1.0", - "android.hardware.camera.provider@2.4", - "android.hardware.camera.provider@2.5", - "android.hardware.camera.provider@2.6", - "libmtkcam_ulog", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - relative_install_path: "hw/mt6886", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "android.hardware.graphics.allocator@4.0-impl-mediatek", owner: "nothing", @@ -19031,173 +18996,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libmtkcam_hal_hidl_common", - owner: "nothing", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/mt6886/libmtkcam_hal_hidl_common.so", - ], - shared_libs: [ - "liblog", - "libutils", - "libcutils", - "libmtkcam_ulog", - "android.hardware.camera.common@1.0", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - relative_install_path: "mt6886", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libmtkcam_hal_hidl_device", - owner: "nothing", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/mt6886/libmtkcam_hal_hidl_device.so", - ], - shared_libs: [ - "liblog", - "libutils", - "libcutils", - "libhardware", - "libhidlbase", - "libhidltransport", - "libfmq", - "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.device@3.6", - "libcamera_metadata", - "libmtkcam_ulog", - "libmtkcam_stdutils", - "libmtkcam_debugutils", - "libmtkcam_hal_hidl_common", - "libmtkcam_hal_hidl_utils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - relative_install_path: "mt6886", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libmtkcam_hal_hidl_provider", - owner: "nothing", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/mt6886/libmtkcam_hal_hidl_provider.so", - ], - shared_libs: [ - "android.hardware.camera.provider@2.4", - "android.hardware.camera.provider@2.5", - "android.hardware.camera.provider@2.6", - "android.hardware.camera.device@3.6", - "android.hardware.graphics.allocator@4.0", - "android.hardware.graphics.mapper@4.0", - "android.hardware.graphics.common@1.2", - "liblog", - "libutils", - "libcutils", - "libcamera_metadata", - "libhardware", - "libhidlbase", - "libhidltransport", - "libfmq", - "libmtkcam_hal_android_provider", - "libmtkcam_hal_hidl_common", - "libmtkcam_hal_hidl_device", - "libmtkcam_ulog", - "libmtkcam_metaconv", - "libmtkcam_stdutils", - "libui", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - relative_install_path: "mt6886", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libmtkcam_hal_hidl_utils", - owner: "nothing", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/mt6886/libmtkcam_hal_hidl_utils.so", - ], - shared_libs: [ - "liblog", - "libutils", - "libcutils", - "libhardware", - "libhidlbase", - "libhidltransport", - "libfmq", - "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.device@3.6", - "libmtkcam_stdutils", - "libmtkcam_imgbuf_v2", - "libmtkcam_grallocutils", - "libmtkcam_hwutils", - "libmtkcam_sysutils", - "libmtkcam_metadata", - "libmtkcam_modulehelper", - "libmtkcam_streamutils", - "libcamera_metadata", - "libmtkcam_ulog", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - relative_install_path: "mt6886", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libmtkcam_hwnode", owner: "nothing", @@ -26906,13 +26704,6 @@ install_symlink { symlink_target: "/vendor/lib64/hw/libSoftGatekeeper.so", } -install_symlink { - name: "vendor_lib64_hw_android_hardware_camera_provider@2_6-impl-mediatek_so", - soc_specific: true, - installed_location: "lib64/hw/android.hardware.camera.provider@2.6-impl-mediatek.so", - symlink_target: "/vendor/lib64/hw/mt6886/android.hardware.camera.provider@2.6-impl-mediatek.so", -} - install_symlink { name: "vendor_lib64_hw_android_hardware_graphics_allocator@4_0-impl-mediatek_so", soc_specific: true, @@ -28866,34 +28657,6 @@ install_symlink { symlink_target: "/vendor/lib64/mt6886/libmtkcam_hal_custom_utils.so", } -install_symlink { - name: "vendor_lib64_libmtkcam_hal_hidl_common_so", - soc_specific: true, - installed_location: "lib64/libmtkcam_hal_hidl_common.so", - symlink_target: "/vendor/lib64/mt6886/libmtkcam_hal_hidl_common.so", -} - -install_symlink { - name: "vendor_lib64_libmtkcam_hal_hidl_device_so", - soc_specific: true, - installed_location: "lib64/libmtkcam_hal_hidl_device.so", - symlink_target: "/vendor/lib64/mt6886/libmtkcam_hal_hidl_device.so", -} - -install_symlink { - name: "vendor_lib64_libmtkcam_hal_hidl_provider_so", - soc_specific: true, - installed_location: "lib64/libmtkcam_hal_hidl_provider.so", - symlink_target: "/vendor/lib64/mt6886/libmtkcam_hal_hidl_provider.so", -} - -install_symlink { - name: "vendor_lib64_libmtkcam_hal_hidl_utils_so", - soc_specific: true, - installed_location: "lib64/libmtkcam_hal_hidl_utils.so", - symlink_target: "/vendor/lib64/mt6886/libmtkcam_hal_hidl_utils.so", -} - install_symlink { name: "vendor_lib64_libmtkcam_hwnode_so", soc_specific: true, diff --git a/proprietary/vendor/lib64/hw/mt6886/android.hardware.camera.provider@2.6-impl-mediatek.so b/proprietary/vendor/lib64/hw/mt6886/android.hardware.camera.provider@2.6-impl-mediatek.so deleted file mode 100644 index a591bf5..0000000 Binary files a/proprietary/vendor/lib64/hw/mt6886/android.hardware.camera.provider@2.6-impl-mediatek.so and /dev/null differ diff --git a/proprietary/vendor/lib64/mt6886/libmtkcam_hal_hidl_common.so b/proprietary/vendor/lib64/mt6886/libmtkcam_hal_hidl_common.so deleted file mode 100644 index 57d2ce3..0000000 Binary files a/proprietary/vendor/lib64/mt6886/libmtkcam_hal_hidl_common.so and /dev/null differ diff --git a/proprietary/vendor/lib64/mt6886/libmtkcam_hal_hidl_device.so b/proprietary/vendor/lib64/mt6886/libmtkcam_hal_hidl_device.so deleted file mode 100644 index 03b2f50..0000000 Binary files a/proprietary/vendor/lib64/mt6886/libmtkcam_hal_hidl_device.so and /dev/null differ diff --git a/proprietary/vendor/lib64/mt6886/libmtkcam_hal_hidl_provider.so b/proprietary/vendor/lib64/mt6886/libmtkcam_hal_hidl_provider.so deleted file mode 100644 index 8a1df8e..0000000 Binary files a/proprietary/vendor/lib64/mt6886/libmtkcam_hal_hidl_provider.so and /dev/null differ diff --git a/proprietary/vendor/lib64/mt6886/libmtkcam_hal_hidl_utils.so b/proprietary/vendor/lib64/mt6886/libmtkcam_hal_hidl_utils.so deleted file mode 100644 index 4c8ea3c..0000000 Binary files a/proprietary/vendor/lib64/mt6886/libmtkcam_hal_hidl_utils.so and /dev/null differ