From 3738b23d96677b47b196d27d35e8de90245786ee Mon Sep 17 00:00:00 2001 From: Nicholas Lim Date: Mon, 29 Jun 2026 02:22:00 +0800 Subject: [PATCH] klee: Rename MediaTek libmnl to libmnl_mtk - libmnl is MediaTek's Navigation Library - Add _mtk suffix to avoid colliding with AOSP libmnl (netlink) Change-Id: I53c253a6ec721d6d385b10e8c022608424b2f0e3 --- Android.bp | 65 +++++++++--------- klee-vendor.mk | 4 +- proprietary/vendor/bin/mnld | Bin 754888 -> 798745 bytes .../lib64/{mt6899/libmnl.so => libmnl_mtk.so} | Bin 7615352 -> 7690001 bytes 4 files changed, 34 insertions(+), 35 deletions(-) rename proprietary/vendor/lib64/{mt6899/libmnl.so => libmnl_mtk.so} (98%) 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 ee3cd31b240db9e7e80b7acf08a1446983360ee5..7f9d09da1be46d462120457aa30b1e49b7428003 100755 GIT binary patch delta 13068 zcmeI3zl#$=6vyA}Uhd+}p=V;q=0|bqtd1ObVL@;$1S6(Mc^-lwHsYNZISWC!4QHWt z$!)P(Sy)+0IMzSFBG_1Zod-6Sxy~v$J2Oilg1qKc_ZHqxX5ROG-|PoczVX}j_ovN) zzjP69LJh7AgGPLEAXi0x_$i2bjvx7sKm6T`2Esp5yRq=2E#cQ(09a4~u%h1pUbYUS zM!2Xq|D^P(*EGs(1rYimwM)aZmY%hot+viAw!NuI>zcN%30|lr>W5y}^cx^s&AkD( z$)1qR8E4G>ah#}B%%6%Z&X@V)I8mvXKNVS=FZ0K7qEaz`DzZ3V=8xk5ry`5Z!&X=}q!|)ycCT;8jhhY1T@2N(Oh`-nH3# zt1vosrk*H9KWpVm5xVb8Ro)oG9S5KR#pqH!&3>`j>|4ItY@oA~x!Qsn3rTDDbapV8 ty=Su@boRxZvuB;Z*UN<>oXllM_tz$+%R7%B?mpdlu>1VU`u<*e-@jGmU`7A{ delta 653 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 Jo76MTe*pfIyHo%G delta 6129 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