From 59bc317680877a0181f0484aa20d4ba5bf21ae43 Mon Sep 17 00:00:00 2001
From: Arne Coucheron <arco68@gmail.com>
Date: Thu, 26 Nov 2015 23:41:36 -0200
Subject: [PATCH] galaxys2-common: Shim library for missing symbols in Samsung
 blobs

Change-Id: Ie67016ecdc5df7a18debd07bcb923886dcacb8a0
---
 common.mk                          |  4 ++++
 libsamsung_symbols/Android.mk      | 28 ++++++++++++++++++++++++++++
 libsamsung_symbols/samsung_ril.cpp | 21 +++++++++++++++++++++
 rootdir/init.smdk4210.rc           |  2 ++
 4 files changed, 55 insertions(+)
 create mode 100644 libsamsung_symbols/Android.mk
 create mode 100644 libsamsung_symbols/samsung_ril.cpp

diff --git a/common.mk b/common.mk
index 16ffa9e..1d31c5a 100644
--- a/common.mk
+++ b/common.mk
@@ -59,6 +59,10 @@ PRODUCT_PACKAGES := \
     com.android.future.usb.accessory \
     SamsungServiceMode
 
+# Samsung symbols
+PRODUCT_PACKAGES += \
+    libsamsung_symbols
+
 # Audio Packages
 PRODUCT_PACKAGES += \
     AdvancedDisplay \
diff --git a/libsamsung_symbols/Android.mk b/libsamsung_symbols/Android.mk
new file mode 100644
index 0000000..c2e942e
--- /dev/null
+++ b/libsamsung_symbols/Android.mk
@@ -0,0 +1,28 @@
+# Copyright (C) 2015 The CyanogenMod Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+    samsung_ril.cpp
+
+LOCAL_SHARED_LIBRARIES := libbinder
+
+LOCAL_MODULE := libsamsung_symbols
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/libsamsung_symbols/samsung_ril.cpp b/libsamsung_symbols/samsung_ril.cpp
new file mode 100644
index 0000000..404616d
--- /dev/null
+++ b/libsamsung_symbols/samsung_ril.cpp
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2015 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* status_t Parcel::writeString16 */
+extern "C" int _ZN7android6Parcel13writeString16EPKDsj();
+extern "C" int _ZN7android6Parcel13writeString16EPKtj() {
+    return _ZN7android6Parcel13writeString16EPKDsj();
+}
diff --git a/rootdir/init.smdk4210.rc b/rootdir/init.smdk4210.rc
index 96a989f..fed39e8 100644
--- a/rootdir/init.smdk4210.rc
+++ b/rootdir/init.smdk4210.rc
@@ -2,6 +2,8 @@ import init.smdk4210.usb.rc
 import init.gps.rc
 
 on init
+    export LD_PRELOAD "/system/lib/libsamsung_symbols.so"
+
     mkdir /efs 0771 radio system
     mkdir /preload 0771 system system
     mkdir /mnt 0775 root system