diff --git a/Android.bp b/Android.bp index c8284c0..9af2187 100644 --- a/Android.bp +++ b/Android.bp @@ -8538,6 +8538,30 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libmnl_mtk", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libmnl_mtk.so", + ], + shared_libs: [ + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libmsbc_mtk", owner: "xiaomi", @@ -21195,31 +21219,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libmnl", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/mt6899/libmnl.so", - ], - shared_libs: [ - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - relative_install_path: "mt6899", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libmtk_mali_utils", owner: "xiaomi", @@ -39363,7 +39362,7 @@ cc_prebuilt_binary { "proprietary/vendor/bin/mnld", ], shared_libs: [ - "libmnl", + "libmnl_mtk", "libcurl", "libcutils", "libnvram", @@ -40549,6 +40548,13 @@ install_symlink { symlink_target: "/vendor/lib64/hw/mt6899/vulkan.mali.so", } +install_symlink { + name: "vendor_lib64_libmnl_so", + soc_specific: true, + installed_location: "lib64/libmnl.so", + symlink_target: "/vendor/lib64/libmnl_mtk.so", +} + install_symlink { name: "vendor_lib64_arm_graphics-V5-ndk_so", soc_specific: true, @@ -42320,13 +42326,6 @@ install_symlink { symlink_target: "/vendor/lib64/mt6899/libmmlpqImpl.so", } -install_symlink { - name: "vendor_lib64_libmnl_so", - soc_specific: true, - installed_location: "lib64/libmnl.so", - symlink_target: "/vendor/lib64/mt6899/libmnl.so", -} - install_symlink { name: "vendor_lib64_libmtk_mali_utils_so", soc_specific: true, diff --git a/klee-vendor.mk b/klee-vendor.mk index 5259672..bb596fc 100644 --- a/klee-vendor.mk +++ b/klee-vendor.mk @@ -1164,6 +1164,7 @@ PRODUCT_PACKAGES += \ libmispowerop \ libmmprofile \ libmnetlink_v104 \ + libmnl_mtk \ libmsbc_mtk \ libmtk-fusion-ril-prop-vsim \ libmtk-ril \ @@ -1564,7 +1565,6 @@ PRODUCT_PACKAGES += \ libmmagent \ libmml \ libmmlpqImpl \ - libmnl \ libmtk_mali_utils \ libmtkcam.atmseventmgr \ libmtkcam.debugwrapper \ @@ -2226,6 +2226,7 @@ PRODUCT_PACKAGES += \ vendor_lib64_hw_vendor_mediatek_hardware_camera_isphal@1_1-impl_so \ vendor_lib64_hw_vendor_mediatek_hardware_pq_aidl-impl_so \ vendor_lib64_hw_vulkan_mali_so \ + vendor_lib64_libmnl_so \ vendor_lib64_arm_graphics-V5-ndk_so \ vendor_lib64_arm_mali_platform-V2-ndk_so \ vendor_lib64_goyaov13bultra_mipi_raw_IdxMgr_so \ @@ -2479,7 +2480,6 @@ PRODUCT_PACKAGES += \ vendor_lib64_libmmagent_so \ vendor_lib64_libmml_so \ vendor_lib64_libmmlpqImpl_so \ - vendor_lib64_libmnl_so \ vendor_lib64_libmtk_mali_utils_so \ vendor_lib64_libmtkcam_atmseventmgr_so \ vendor_lib64_libmtkcam_debugwrapper_so \ diff --git a/proprietary/vendor/bin/mnld b/proprietary/vendor/bin/mnld index ee3cd31..7f9d09d 100755 Binary files a/proprietary/vendor/bin/mnld and b/proprietary/vendor/bin/mnld differ diff --git a/proprietary/vendor/lib64/mt6899/libmnl.so b/proprietary/vendor/lib64/libmnl_mtk.so similarity index 98% rename from proprietary/vendor/lib64/mt6899/libmnl.so rename to proprietary/vendor/lib64/libmnl_mtk.so index b4d23d4..769f232 100644 Binary files a/proprietary/vendor/lib64/mt6899/libmnl.so and b/proprietary/vendor/lib64/libmnl_mtk.so differ