From 90ab2176ea4ddfdb3274656d8a5d34adf2ded7a1 Mon Sep 17 00:00:00 2001
From: Davide Garberi <dade.garberi@gmail.com>
Date: Sun, 1 Sep 2019 22:43:29 +0200
Subject: [PATCH] sdm660-common: Nuke libMiWatermark and replace it with a shim

* This lib is creating troubles on android 10 requiring old libs in vendor
* Other than that, it's the only culprit for vndk runtime being kept disabled
* Nuke this lib via a empty shim providing the symbols to the camera hal
---
 extract-files.sh         |  1 +
 libshims/Android.bp      | 17 +++++++++++++++++
 libshims/miwatermark.cpp | 10 ++++++++++
 sdm660.mk                |  1 +
 4 files changed, 29 insertions(+)
 create mode 100644 libshims/Android.bp
 create mode 100644 libshims/miwatermark.cpp

diff --git a/extract-files.sh b/extract-files.sh
index 2f53dc84..07121c7b 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -79,3 +79,4 @@ sed -i "s|/system/etc/firmware|/vendor/firmware\x0\x0\x0\x0|g" "$DEVICE_BLOB_ROO
 # Load camera.sdm660.so shim
 CAM_SDM660="$DEVICE_BLOB_ROOT"/vendor/lib/hw/camera.sdm660.so
 patchelf --add-needed camera.sdm660_shim.so "$CAM_SDM660"
+patchelf --replace-needed libMiWatermark.so libMiWatermark_shim.so "$CAM_SDM660"
diff --git a/libshims/Android.bp b/libshims/Android.bp
new file mode 100644
index 00000000..a1f2c0d5
--- /dev/null
+++ b/libshims/Android.bp
@@ -0,0 +1,17 @@
+/* libMiWatermark */
+cc_library_shared {
+    name: "libMiWatermark_shim",
+    proprietary: true,
+    defaults: ["hidl_defaults"],
+    srcs: [
+        "miwatermark.cpp",
+    ],
+    cflags: [
+        "-Werror",
+        "-Wextra",
+        "-Wall",
+    ],
+    shared_libs: [
+        "libutils",
+    ],
+}
diff --git a/libshims/miwatermark.cpp b/libshims/miwatermark.cpp
new file mode 100644
index 00000000..b2daf373
--- /dev/null
+++ b/libshims/miwatermark.cpp
@@ -0,0 +1,10 @@
+#include <stdint.h>
+
+namespace android {
+	extern "C" void miwatermark_age() {}
+	extern "C" void miwatermark_deinit() {}
+	extern "C" void miwatermark_dualcamera() {}
+	extern "C" void miwatermark_init() {}
+	extern "C" void miwatermark_score() {}
+	extern "C" void miwatermark_time() {}
+}
diff --git a/sdm660.mk b/sdm660.mk
index bd00d79a..cff6fde3 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -173,6 +173,7 @@ PRODUCT_PACKAGES += \
     libbthost_if
 
 PRODUCT_PACKAGES += \
+    libMiWatermark_shim \
     Snap
 
 PRODUCT_PACKAGES += \