From 481eb83edf6eaaae2705ea0d83e4d9ddd20ea701 Mon Sep 17 00:00:00 2001
From: bengris32 <bengris32@protonmail.ch>
Date: Sun, 28 May 2023 20:11:01 +0100
Subject: [PATCH] rosemary: Shim missing `libshowlogo` symbol

* ui::Size was changed going from VNDK32 to VNDK33 [1] and
  ui::Size::INVALID constant was removed. However, all we need
  to do is set INVALID to a Size with a width/height of -1.

[1]: https://cs.android.com/android/_/android/platform/frameworks/native/+/6d043c5c5c1d544c0ecf07cfc07e374e50243050

Signed-off-by: bengris32 <bengris32@protonmail.ch>
Change-Id: I4a224c6c3f622152a8bdc9f70bca18263af068cd
---
 device.mk                     |  3 +++
 extract-files.sh              |  3 +++
 libshims/Android.bp           |  7 +++++++
 libshims/libshim_showlogo.cpp | 11 +++++++++++
 4 files changed, 24 insertions(+)
 create mode 100644 libshims/Android.bp
 create mode 100644 libshims/libshim_showlogo.cpp

diff --git a/device.mk b/device.mk
index 166d26a..57f78e9 100644
--- a/device.mk
+++ b/device.mk
@@ -109,6 +109,9 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     libsuspend
 
+PRODUCT_PACKAGES += \
+    libshim_showlogo
+
 # Display
 TARGET_SCREEN_DENSITY := 440
 TARGET_SCREEN_HEIGHT := 2400
diff --git a/extract-files.sh b/extract-files.sh
index 8baa1e0..8430908 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -55,6 +55,9 @@ fi
 
 function blob_fixup {
     case "$1" in
+        lib64/libshowlogo.so)
+            "${PATCHELF}" --add-needed "libshim_showlogo.so" "${2}"
+            ;;
         vendor/bin/hw/android.hardware.gnss-service.mediatek |\
         vendor/lib64/hw/android.hardware.gnss-impl-mediatek.so)
             "$PATCHELF" --replace-needed "android.hardware.gnss-V1-ndk_platform.so" "android.hardware.gnss-V1-ndk.so" "$2"
diff --git a/libshims/Android.bp b/libshims/Android.bp
new file mode 100644
index 0000000..20a4c80
--- /dev/null
+++ b/libshims/Android.bp
@@ -0,0 +1,7 @@
+cc_library_shared {
+    name: "libshim_showlogo",
+    srcs: ["libshim_showlogo.cpp"],
+    shared_libs: [
+        "libui",
+    ]
+}
diff --git a/libshims/libshim_showlogo.cpp b/libshims/libshim_showlogo.cpp
new file mode 100644
index 0000000..bbcf0b6
--- /dev/null
+++ b/libshims/libshim_showlogo.cpp
@@ -0,0 +1,11 @@
+/*
+ * Copyright (C) 2023 The LineageOS Project
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <ui/Size.h>
+
+using namespace android;
+
+extern "C" ui::Size _ZN7android2ui4Size7INVALIDE{-1, -1};