From 7d46f91ce0a66427eba3517050ccceac9104cee0 Mon Sep 17 00:00:00 2001
From: basamaryan <basam.aryan@gmail.com>
Date: Sun, 5 Jan 2025 10:25:02 +0100
Subject: [PATCH] sm6150-common: fix libmmosal ELF checks

Change-Id: I1fc1b4b72b8a8a4f8775c9a7a4965f9d78433254
Signed-off-by: donjohanliebert <donjohanliebert@gmail.com>
---
 Android.bp              | 47 +++++++++++++++++++++--------------------
 sm6150-common-vendor.mk |  2 +-
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/Android.bp b/Android.bp
index 63e591f..6d1db37 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1091,7 +1091,8 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-    name: "libmmosal",
+    name: "libmmosal_vendor",
+    stem: "libmmosal",
     owner: "xiaomi",
     strip: {
         none: true,
@@ -1801,7 +1802,7 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib/libFileMux_proprietary.so",
             ],
             shared_libs: [
-                "libmmosal",
+                "libmmosal_vendor",
                 "liblog",
                 "libutils",
                 "libcutils",
@@ -2224,7 +2225,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "liblog",
                 "libcutils",
-                "libmmosal",
+                "libmmosal_vendor",
                 "libc++",
                 "libc",
                 "libm",
@@ -2249,7 +2250,7 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib/libmmrtpencoder_proprietary.so",
             ],
             shared_libs: [
-                "libmmosal",
+                "libmmosal_vendor",
                 "liblog",
                 "libutils",
                 "libcutils",
@@ -2392,7 +2393,7 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib/libwfdcodecv4l2_proprietary.so",
             ],
             shared_libs: [
-                "libmmosal",
+                "libmmosal_vendor",
                 "liblog",
                 "libutils",
                 "libcutils",
@@ -2423,7 +2424,7 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib/libwfdcommonutils_proprietary.so",
             ],
             shared_libs: [
-                "libmmosal",
+                "libmmosal_vendor",
                 "liblog",
                 "libutils",
                 "libcutils",
@@ -2454,7 +2455,7 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib/libwfdconfigutils_proprietary.so",
             ],
             shared_libs: [
-                "libmmosal",
+                "libmmosal_vendor",
                 "liblog",
                 "libutils",
                 "libcutils",
@@ -2515,7 +2516,7 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib/libwfdhdcpcp.so",
             ],
             shared_libs: [
-                "libmmosal",
+                "libmmosal_vendor",
                 "liblog",
                 "libutils",
                 "libcutils",
@@ -2543,7 +2544,7 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib/libwfdhdcpservice_proprietary.so",
             ],
             shared_libs: [
-                "libmmosal",
+                "libmmosal_vendor",
                 "liblog",
                 "libutils",
                 "libcutils",
@@ -2574,7 +2575,7 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib/libwfdmminterface_proprietary.so",
             ],
             shared_libs: [
-                "libmmosal",
+                "libmmosal_vendor",
                 "liblog",
                 "libutils",
                 "libc++",
@@ -2601,7 +2602,7 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib/libwfdmmservice_proprietary.so",
             ],
             shared_libs: [
-                "libmmosal",
+                "libmmosal_vendor",
                 "liblog",
                 "libutils",
                 "libcutils",
@@ -2631,7 +2632,7 @@ cc_prebuilt_library_shared {
             ],
             shared_libs: [
                 "libbinder",
-                "libmmosal",
+                "libmmosal_vendor",
                 "liblog",
                 "libutils",
                 "libmmrtpencoder_proprietary",
@@ -2672,7 +2673,7 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib/libwfdmodulehdcpsession.so",
             ],
             shared_libs: [
-                "libmmosal",
+                "libmmosal_vendor",
                 "liblog",
                 "libutils",
                 "libwfdhdcpcp",
@@ -2706,7 +2707,7 @@ cc_prebuilt_library_shared {
                 "libc++",
                 "libcutils",
                 "libutils",
-                "libmmosal",
+                "libmmosal_vendor",
                 "libwfdcommonutils_proprietary",
                 "libwfdconfigutils_proprietary",
                 "liblog",
@@ -2733,7 +2734,7 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib/libwfdsessionmodule.so",
             ],
             shared_libs: [
-                "libmmosal",
+                "libmmosal_vendor",
                 "liblog",
                 "libutils",
                 "libwfdsourcesession_proprietary",
@@ -2768,7 +2769,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcutils",
                 "libbinder",
-                "libmmosal",
+                "libmmosal_vendor",
                 "libwfdcommonutils_proprietary",
                 "libwfdconfigutils_proprietary",
                 "libwfdmminterface_proprietary",
@@ -2809,7 +2810,7 @@ cc_prebuilt_library_shared {
                 "libmmrtpdecoder_proprietary",
                 "libwfduibcinterface_proprietary",
                 "libwfdmmsrc_proprietary",
-                "libmmosal",
+                "libmmosal_vendor",
                 "libwfdcommonutils_proprietary",
                 "libwfdconfigutils_proprietary",
                 "libqdMetaData",
@@ -2841,7 +2842,7 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib/libwfduibcinterface_proprietary.so",
             ],
             shared_libs: [
-                "libmmosal",
+                "libmmosal_vendor",
                 "liblog",
                 "libutils",
                 "libcutils",
@@ -2871,7 +2872,7 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib/libwfduibcsink_proprietary.so",
             ],
             shared_libs: [
-                "libmmosal",
+                "libmmosal_vendor",
                 "libutils",
                 "liblog",
                 "libc++",
@@ -2898,7 +2899,7 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib/libwfduibcsinkinterface_proprietary.so",
             ],
             shared_libs: [
-                "libmmosal",
+                "libmmosal_vendor",
                 "liblog",
                 "libutils",
                 "libcutils",
@@ -2929,7 +2930,7 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib/libwfduibcsrc_proprietary.so",
             ],
             shared_libs: [
-                "libmmosal",
+                "libmmosal_vendor",
                 "libwfdcommonutils_proprietary",
                 "liblog",
                 "libutils",
@@ -2960,7 +2961,7 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib/libwfduibcsrcinterface_proprietary.so",
             ],
             shared_libs: [
-                "libmmosal",
+                "libmmosal_vendor",
                 "liblog",
                 "libutils",
                 "libcutils",
@@ -2991,7 +2992,7 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib/libwfdutils_proprietary.so",
             ],
             shared_libs: [
-                "libmmosal",
+                "libmmosal_vendor",
                 "liblog",
                 "libion",
                 "libc++",
diff --git a/sm6150-common-vendor.mk b/sm6150-common-vendor.mk
index 76234c4..6cc0f9c 100644
--- a/sm6150-common-vendor.mk
+++ b/sm6150-common-vendor.mk
@@ -132,7 +132,7 @@ PRODUCT_PACKAGES += \
     libllvm-glnext \
     libllvm-qcom \
     libmdmdetect \
-    libmmosal \
+    libmmosal_vendor \
     libqmi \
     libqmi_cci \
     libqmi_client_helper \