From 748ced628c30cc587aa47ed2dc347f0ccc1034bf Mon Sep 17 00:00:00 2001
From: Alessandro Astone <ales.astone@gmail.com>
Date: Tue, 10 Sep 2019 09:57:50 +0200
Subject: [PATCH] matisse-common: Shim libperipheral_client.so

* LocSvc_afw: get_geofence_interface, dlopen for libgeofence.so
  failed, error = dlopen failed: cannot locate symbol
  "_ZN7android10IInterface8asBinderEv" referenced by
  "/system/vendor/lib/libperipheral_client.so"...
* vndksupport: Could not load /vendor/lib/hw/flp.default.so from
  default namespace: dlopen failed: cannot locate symbol
  "_ZN7android10IInterface8asBinderEv" referenced by
  "/system/vendor/lib/libperipheral_client.so"....

Change-Id: I4fed5fc23b1721e75e9759c0811b7532c5b68705
---
 BoardConfigCommon.mk | 2 ++
 matisse.mk           | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index e44ff82..f9557a9 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -70,6 +70,8 @@ LZMA_RAMDISK_TARGETS := recovery
 TARGET_KERNEL_SOURCE := kernel/samsung/msm8226
 
 # Legacy BLOB Support
+TARGET_LD_SHIM_LIBS += \
+    /system/vendor/lib/libperipheral_client.so|libshim_binder.so
 TARGET_PROCESS_SDK_VERSION_OVERRIDE += \
     /system/bin/mediaserver=22 \
     /system/vendor/bin/mm-qcamera-daemon=22 \
diff --git a/matisse.mk b/matisse.mk
index 03847a8..92b6a45 100644
--- a/matisse.mk
+++ b/matisse.mk
@@ -88,6 +88,13 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/sensors/_hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/_hals.conf
 
+# Shims
+PRODUCT_PACKAGES += \
+    libshim_binder
+
+# Shipping API level
+$(call inherit-product, $(SRC_TARGET_DIR)/product/product_launched_with_k.mk)
+
 # Soong namespaces
 PRODUCT_SOONG_NAMESPACES += \
     $(LOCAL_PATH)
@@ -97,7 +104,6 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/thermal-engine-8226.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine-8226.conf
 
 # Get non-open-source specific aspects
-$(call inherit-product, $(SRC_TARGET_DIR)/product/product_launched_with_k.mk)
 $(call inherit-product-if-exists, vendor/samsung/matisse-common/matisse-common-vendor.mk)
 
 # common msm8226