diff --git a/Android.bp b/Android.bp index 054b44d..1dedb97 100644 --- a/Android.bp +++ b/Android.bp @@ -716,7 +716,8 @@ cc_prebuilt_library_shared { } cc_prebuilt_library_shared { - name: "libmmosal", + name: "libmmosal-vendor", + stem: "libmmosal", owner: "xiaomi", strip: { none: true, @@ -1596,7 +1597,7 @@ cc_prebuilt_library_shared { target: { android_arm: { srcs: ["proprietary/vendor/lib/libFileMux_proprietary.so"], - shared_libs: ["libmmosal", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libmmosal-vendor", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "32", @@ -1647,7 +1648,7 @@ cc_prebuilt_library_shared { target: { android_arm: { srcs: ["proprietary/vendor/lib/libOmxVideoDSMode.so"], - shared_libs: ["liblog", "libmmosal", "libutils", "libOmxCore", "libwfdcommonutils_proprietary", "libwfdmmservice_proprietary", "libbinder", "libwfdutils_proprietary", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["liblog", "libmmosal-vendor", "libutils", "libOmxCore", "libwfdcommonutils_proprietary", "libwfdmmservice_proprietary", "libbinder", "libwfdutils_proprietary", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "32", @@ -1851,7 +1852,7 @@ cc_prebuilt_library_shared { target: { android_arm: { srcs: ["proprietary/vendor/lib/libmmrtpdecoder_proprietary.so"], - shared_libs: ["libutils", "liblog", "libcutils", "libmmosal", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libutils", "liblog", "libcutils", "libmmosal-vendor", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "32", @@ -1868,7 +1869,7 @@ cc_prebuilt_library_shared { target: { android_arm: { srcs: ["proprietary/vendor/lib/libmmrtpencoder_proprietary.so"], - shared_libs: ["libmmosal", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libmmosal-vendor", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "32", @@ -2038,7 +2039,7 @@ cc_prebuilt_library_shared { target: { android_arm: { srcs: ["proprietary/vendor/lib/libwfdcodecv4l2_proprietary.so"], - shared_libs: ["libmmosal", "liblog", "libutils", "libcutils", "libwfdcommonutils_proprietary", "libwfdmminterface_proprietary", "libwfdutils_proprietary", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libmmosal-vendor", "liblog", "libutils", "libcutils", "libwfdcommonutils_proprietary", "libwfdmminterface_proprietary", "libwfdutils_proprietary", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "32", @@ -2055,7 +2056,7 @@ cc_prebuilt_library_shared { target: { android_arm: { srcs: ["proprietary/vendor/lib/libwfdcommonutils_proprietary.so"], - shared_libs: ["libmmosal", "liblog", "libutils", "libcutils", "libion", "libprocessgroup", "libwfddisplayconfig_proprietary", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libmmosal-vendor", "liblog", "libutils", "libcutils", "libion", "libprocessgroup", "libwfddisplayconfig_proprietary", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "32", @@ -2072,7 +2073,7 @@ cc_prebuilt_library_shared { target: { android_arm: { srcs: ["proprietary/vendor/lib/libwfdconfigutils_proprietary.so"], - shared_libs: ["libmmosal", "liblog", "libutils", "libcutils", "libbinder", "libnl", "libwfdmminterface_proprietary", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libmmosal-vendor", "liblog", "libutils", "libcutils", "libbinder", "libnl", "libwfdmminterface_proprietary", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "32", @@ -2106,7 +2107,7 @@ cc_prebuilt_library_shared { target: { android_arm: { srcs: ["proprietary/vendor/lib/libwfdhdcpcp.so"], - shared_libs: ["libmmosal", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libmmosal-vendor", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "32", @@ -2123,7 +2124,7 @@ cc_prebuilt_library_shared { target: { android_arm: { srcs: ["proprietary/vendor/lib/libwfdhdcpservice_proprietary.so"], - shared_libs: ["libmmosal", "liblog", "libutils", "libcutils", "libbinder", "libwfdhdcpcp", "libc++", "libclang_rt.ubsan_standalone", "libc", "libm", "libdl", ], + shared_libs: ["libmmosal-vendor", "liblog", "libutils", "libcutils", "libbinder", "libwfdhdcpcp", "libc++", "libclang_rt.ubsan_standalone", "libc", "libm", "libdl", ], }, }, compile_multilib: "32", @@ -2140,7 +2141,7 @@ cc_prebuilt_library_shared { target: { android_arm: { srcs: ["proprietary/vendor/lib/libwfdmminterface_proprietary.so"], - shared_libs: ["libmmosal", "liblog", "libutils", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libmmosal-vendor", "liblog", "libutils", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "32", @@ -2157,7 +2158,7 @@ cc_prebuilt_library_shared { target: { android_arm: { srcs: ["proprietary/vendor/lib/libwfdmmservice_proprietary.so"], - shared_libs: ["libmmosal", "liblog", "libutils", "libcutils", "libbinder", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libmmosal-vendor", "liblog", "libutils", "libcutils", "libbinder", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "32", @@ -2174,7 +2175,7 @@ cc_prebuilt_library_shared { target: { android_arm: { srcs: ["proprietary/vendor/lib/libwfdmmsrc_proprietary.so"], - shared_libs: ["libbinder", "libmmosal", "liblog", "libutils", "libmmrtpencoder_proprietary", "libFileMux_proprietary", "libcutils", "libtinyalsa", "libwfdcommonutils_proprietary", "libwfdutils_proprietary", "libwfdconfigutils_proprietary", "libwfdaac_vendor", "libpng", "libwfdmminterface_proprietary", "libwfdcodecv4l2_proprietary", "libwfdmmservice_proprietary", "libhidlbase", "android.hardware.graphics.mapper@2.0", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libbinder", "libmmosal-vendor", "liblog", "libutils", "libmmrtpencoder_proprietary", "libFileMux_proprietary", "libcutils", "libtinyalsa", "libwfdcommonutils_proprietary", "libwfdutils_proprietary", "libwfdconfigutils_proprietary", "libwfdaac_vendor", "libpng", "libwfdmminterface_proprietary", "libwfdcodecv4l2_proprietary", "libwfdmmservice_proprietary", "libhidlbase", "android.hardware.graphics.mapper@2.0", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "32", @@ -2191,7 +2192,7 @@ cc_prebuilt_library_shared { target: { android_arm: { srcs: ["proprietary/vendor/lib/libwfdmodulehdcpsession.so"], - shared_libs: ["libmmosal", "liblog", "libutils", "libwfdhdcpcp", "libwfdcommonutils_proprietary", "libhidlbase", "libwfdutils_proprietary", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libmmosal-vendor", "liblog", "libutils", "libwfdhdcpcp", "libwfdcommonutils_proprietary", "libhidlbase", "libwfdutils_proprietary", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "32", @@ -2208,7 +2209,7 @@ cc_prebuilt_library_shared { target: { android_arm: { srcs: ["proprietary/vendor/lib/libwfdrtsp_proprietary.so"], - shared_libs: ["libc++", "libcutils", "libutils", "libmmosal", "libwfdcommonutils_proprietary", "libwfdconfigutils_proprietary", "liblog", "libc", "libm", "libdl", ], + shared_libs: ["libc++", "libcutils", "libutils", "libmmosal-vendor", "libwfdcommonutils_proprietary", "libwfdconfigutils_proprietary", "liblog", "libc", "libm", "libdl", ], }, }, compile_multilib: "32", @@ -2225,7 +2226,7 @@ cc_prebuilt_library_shared { target: { android_arm: { srcs: ["proprietary/vendor/lib/libwfdsessionmodule.so"], - shared_libs: ["libmmosal", "liblog", "libutils", "libwfdsourcesession_proprietary", "vendor.qti.hardware.wifidisplaysession@1.0", "libwfdcommonutils_proprietary", "libhidlbase", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libmmosal-vendor", "liblog", "libutils", "libwfdsourcesession_proprietary", "vendor.qti.hardware.wifidisplaysession@1.0-vendor", "libwfdcommonutils_proprietary", "libhidlbase", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "32", @@ -2242,7 +2243,7 @@ cc_prebuilt_library_shared { target: { android_arm: { srcs: ["proprietary/vendor/lib/libwfdsourcesession_proprietary.so"], - shared_libs: ["liblog", "libutils", "libcutils", "libbinder", "libmmosal", "libwfdcommonutils_proprietary", "libwfdconfigutils_proprietary", "libwfdmminterface_proprietary", "libmedia_helper", "libwfdmmsrc_proprietary", "libqdMetaData", "libhidlbase", "libwfdsourcesm_proprietary", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["liblog", "libutils", "libcutils", "libbinder", "libmmosal-vendor", "libwfdcommonutils_proprietary", "libwfdconfigutils_proprietary", "libwfdmminterface_proprietary", "libmedia_helper", "libwfdmmsrc_proprietary", "libqdMetaData", "libhidlbase", "libwfdsourcesm_proprietary", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "32", @@ -2259,7 +2260,7 @@ cc_prebuilt_library_shared { target: { android_arm: { srcs: ["proprietary/vendor/lib/libwfdsourcesm_proprietary.so"], - shared_libs: ["libc++", "libcutils", "libutils", "libwfdrtsp_proprietary", "libmmrtpencoder_proprietary", "libmmrtpdecoder_proprietary", "libwfduibcinterface_proprietary", "libwfdmmsrc_proprietary", "libmmosal", "libwfdcommonutils_proprietary", "libwfdconfigutils_proprietary", "libqdMetaData", "libwfdmminterface_proprietary", "libwfdmodulehdcpsession", "libhidlbase", "libwfddisplayconfig_proprietary", "liblog", "libc", "libm", "libdl", ], + shared_libs: ["libc++", "libcutils", "libutils", "libwfdrtsp_proprietary", "libmmrtpencoder_proprietary", "libmmrtpdecoder_proprietary", "libwfduibcinterface_proprietary", "libwfdmmsrc_proprietary", "libmmosal-vendor", "libwfdcommonutils_proprietary", "libwfdconfigutils_proprietary", "libqdMetaData", "libwfdmminterface_proprietary", "libwfdmodulehdcpsession", "libhidlbase", "libwfddisplayconfig_proprietary", "liblog", "libc", "libm", "libdl", ], }, }, compile_multilib: "32", @@ -2276,7 +2277,7 @@ cc_prebuilt_library_shared { target: { android_arm: { srcs: ["proprietary/vendor/lib/libwfduibcinterface_proprietary.so"], - shared_libs: ["libmmosal", "liblog", "libutils", "libcutils", "libwfduibcsrcinterface_proprietary", "libwfduibcsinkinterface_proprietary", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libmmosal-vendor", "liblog", "libutils", "libcutils", "libwfduibcsrcinterface_proprietary", "libwfduibcsinkinterface_proprietary", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "32", @@ -2293,7 +2294,7 @@ cc_prebuilt_library_shared { target: { android_arm: { srcs: ["proprietary/vendor/lib/libwfduibcsink_proprietary.so"], - shared_libs: ["libmmosal", "libutils", "liblog", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libmmosal-vendor", "libutils", "liblog", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "32", @@ -2310,7 +2311,7 @@ cc_prebuilt_library_shared { target: { android_arm: { srcs: ["proprietary/vendor/lib/libwfduibcsinkinterface_proprietary.so"], - shared_libs: ["libmmosal", "liblog", "libutils", "libcutils", "libwfduibcsink_proprietary", "libwfdcommonutils_proprietary", "libwfdconfigutils_proprietary", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libmmosal-vendor", "liblog", "libutils", "libcutils", "libwfduibcsink_proprietary", "libwfdcommonutils_proprietary", "libwfdconfigutils_proprietary", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "32", @@ -2327,7 +2328,7 @@ cc_prebuilt_library_shared { target: { android_arm: { srcs: ["proprietary/vendor/lib/libwfduibcsrc_proprietary.so"], - shared_libs: ["libmmosal", "libwfdcommonutils_proprietary", "liblog", "libutils", "libcutils", "libwfdconfigutils_proprietary", "libwfddisplayconfig_proprietary", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libmmosal-vendor", "libwfdcommonutils_proprietary", "liblog", "libutils", "libcutils", "libwfdconfigutils_proprietary", "libwfddisplayconfig_proprietary", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "32", @@ -2344,7 +2345,7 @@ cc_prebuilt_library_shared { target: { android_arm: { srcs: ["proprietary/vendor/lib/libwfduibcsrcinterface_proprietary.so"], - shared_libs: ["libmmosal", "liblog", "libutils", "libcutils", "libwfduibcsrc_proprietary", "libwfdcommonutils_proprietary", "libwfdconfigutils_proprietary", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libmmosal-vendor", "liblog", "libutils", "libcutils", "libwfduibcsrc_proprietary", "libwfdcommonutils_proprietary", "libwfdconfigutils_proprietary", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "32", @@ -2361,7 +2362,7 @@ cc_prebuilt_library_shared { target: { android_arm: { srcs: ["proprietary/vendor/lib/libwfdutils_proprietary.so"], - shared_libs: ["libmmosal", "liblog", "libion", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libmmosal-vendor", "liblog", "libion", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "32", @@ -2406,7 +2407,8 @@ cc_prebuilt_library_shared { } cc_prebuilt_library_shared { - name: "vendor.qti.hardware.wifidisplaysession@1.0", + name: "vendor.qti.hardware.wifidisplaysession@1.0-vendor", + stem: "vendor.qti.hardware.wifidisplaysession@1.0", owner: "xiaomi", strip: { none: true, @@ -2431,7 +2433,7 @@ cc_prebuilt_library_shared { target: { android_arm: { srcs: ["proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so"], - shared_libs: ["libhidlbase", "libutils", "libcutils", "vendor.qti.hardware.wifidisplaysession@1.0", "libwfdsessionmodule", "liblog", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libhidlbase", "libutils", "libcutils", "vendor.qti.hardware.wifidisplaysession@1.0-vendor", "libwfdsessionmodule", "liblog", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "32", @@ -8608,7 +8610,7 @@ cc_prebuilt_binary { target: { android_arm: { srcs: ["proprietary/vendor/bin/wifidisplayhalservice"], - shared_libs: ["vendor.qti.hardware.wifidisplaysession@1.0", "vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl", "libhidlbase", "libutils", "liblog", "libbinder", "libavservices_minijail", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["vendor.qti.hardware.wifidisplaysession@1.0-vendor", "vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl", "libhidlbase", "libutils", "liblog", "libbinder", "libavservices_minijail", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "32", diff --git a/sm8350-common-vendor.mk b/sm8350-common-vendor.mk index 86f09c8..d62dd98 100644 --- a/sm8350-common-vendor.mk +++ b/sm8350-common-vendor.mk @@ -176,7 +176,7 @@ PRODUCT_PACKAGES += \ libidl \ libllvm-glnext \ libllvm-qcom \ - libmmosal \ + libmmosal-vendor \ libperfconfig \ libperfgluelayer \ libperfioctl \ @@ -266,7 +266,7 @@ PRODUCT_PACKAGES += \ libwfdutils_proprietary \ libasphere \ libshoebox \ - vendor.qti.hardware.wifidisplaysession@1.0 \ + vendor.qti.hardware.wifidisplaysession@1.0-vendor \ vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl \ android.hardware.secure_element@1.0-impl \ com.qualcomm.qti.dpm.api@1.0-vendor \