From 70152a364e83b5b0ef7d0d750517d6426abb7922 Mon Sep 17 00:00:00 2001
From: ExtremeXT <extremextdev@gmail.com>
Date: Mon, 27 Oct 2025 15:30:11 +0200
Subject: [PATCH] fixup! universal9830: Decommonize various blobs

Reasons for fixup:
* gatekeeper links with libteecl.so, hence it has to be added as a dummy lib.
* tzts_service links with libuuid.so, hence it has to be added as a dummy lib.

Change-Id: Ic1871dda261a3726a8b17f32a3a752880b28787f
Signed-off-by: ExtremeXT <extremextdev@gmail.com>
---
 Android.bp                          |  37 ++++++++++------------------
 proprietary/vendor/lib64/libuuid.so | Bin 9616 -> 0 bytes
 universal9830-common-vendor.mk      |   1 -
 3 files changed, 13 insertions(+), 25 deletions(-)
 delete mode 100644 proprietary/vendor/lib64/libuuid.so

diff --git a/Android.bp b/Android.bp
index 81fc6c8..8b1c1cf 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2276,30 +2276,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libuuid_vendor",
-    stem: "libuuid",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libuuid.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libc",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libvkmanager_vendor",
     owner: "samsung",
@@ -3205,3 +3181,16 @@ install_symlink {
     installed_location: "lib64/libOpenCL.so.1.1",
     symlink_target: "/vendor/lib64/egl/libGLES_mali.so",
 }
+
+cc_library_shared {
+    name: "libteecl",
+    compile_multilib: "64",
+    soc_specific: true,
+}
+
+cc_library_shared {
+    name: "libuuid_vendor",
+    stem: "libuuid",
+    compile_multilib: "64",
+    soc_specific: true,
+}
diff --git a/proprietary/vendor/lib64/libuuid.so b/proprietary/vendor/lib64/libuuid.so
deleted file mode 100644
index 30472f56f2526564f06889ef0ac1c426b1b77d35..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9616
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
Hov{A{Q)A>@

diff --git a/universal9830-common-vendor.mk b/universal9830-common-vendor.mk
index 5053811..66ddf3c 100644
--- a/universal9830-common-vendor.mk
+++ b/universal9830-common-vendor.mk
@@ -174,7 +174,6 @@ PRODUCT_PACKAGES += \
     libstork_shared \
     libuniapi \
     libuniplugin \
-    libuuid_vendor \
     libvkmanager_vendor \
     libvkservice \
     libvpl \