From 028ad5f7ac3fda5c97f119f896e89849d818cd17 Mon Sep 17 00:00:00 2001 From: Arne Coucheron Date: Sun, 11 Oct 2015 15:28:00 +0530 Subject: espresso-common: Shim library for missing symbols in Samsung blobs Change-Id: If4797df7db6b28f6272c42971297c05341f65710 --- espresso-common.mk | 4 ++++ libsamsung_symbols/Android.mk | 25 +++++++++++++++++++++++++ libsamsung_symbols/samsung_ril.cpp | 21 +++++++++++++++++++++ rootdir/etc/init.tab2.rc | 2 ++ 4 files changed, 52 insertions(+) create mode 100644 libsamsung_symbols/Android.mk create mode 100644 libsamsung_symbols/samsung_ril.cpp diff --git a/espresso-common.mk b/espresso-common.mk index 1329261..36831d6 100644 --- a/espresso-common.mk +++ b/espresso-common.mk @@ -61,6 +61,10 @@ PRODUCT_PROPERTY_OVERRIDES += \ wifi.interface=wlan0 \ wifi.supplicant_scan_interval=15 +# Samsung symbols +PRODUCT_PACKAGES += \ + libsamsung_symbols + # Media profiles PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/media_codecs.xml:system/etc/media_codecs.xml \ diff --git a/libsamsung_symbols/Android.mk b/libsamsung_symbols/Android.mk new file mode 100644 index 0000000..698b1e2 --- /dev/null +++ b/libsamsung_symbols/Android.mk @@ -0,0 +1,25 @@ +# 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_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/etc/init.tab2.rc b/rootdir/etc/init.tab2.rc index 76a4faa..e23e5c3 100644 --- a/rootdir/etc/init.tab2.rc +++ b/rootdir/etc/init.tab2.rc @@ -2,6 +2,8 @@ import init.${ro.hardware}.usb.rc import init.omap4.rc on init + export LD_SHIM_LIBS /system/lib/libril.so|libsamsung_symbols.so + symlink /sdcard /mnt/sdcard symlink /sdcard /storage/sdcard0 -- cgit v1.1