From 92f5203876e48db1af4d8c81d3f32df5a8376dc7 Mon Sep 17 00:00:00 2001
From: PaulK <contact@paulk.fr>
Date: Sun, 4 Dec 2011 13:02:06 +0100
Subject: Modification to use the free RIL/RIL client replacement

---
 device_base.mk             | 6 ++++--
 libaudio/AudioHardware.cpp | 8 ++++----
 system.prop                | 2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/device_base.mk b/device_base.mk
index 61b01b2..f0ccdc1 100644
--- a/device_base.mk
+++ b/device_base.mk
@@ -103,8 +103,10 @@ PRODUCT_PACKAGES += \
 	libakm \
 	com.android.future.usb.accessory
 
-# libsamsung-ipc
-PRODUCT_PACKAGES += ipc-modemctrl
+# RIL/RIL client/libsamsung-ipc
+PRODUCT_PACKAGES += libsamsung-ril \
+	libsamsung-ril-client \
+	ipc-modemctrl
 
 # Input device calibration files
 PRODUCT_COPY_FILES += \
diff --git a/libaudio/AudioHardware.cpp b/libaudio/AudioHardware.cpp
index 2ac7b67..6911d46 100644
--- a/libaudio/AudioHardware.cpp
+++ b/libaudio/AudioHardware.cpp
@@ -141,10 +141,10 @@ status_t AudioHardware::initCheck()
 
 void AudioHardware::loadRILD(void)
 {
-    mSecRilLibHandle = dlopen("libsecril-client.so", RTLD_NOW);
+    mSecRilLibHandle = dlopen("libsamsung-ril-client.so", RTLD_NOW);
 
     if (mSecRilLibHandle) {
-        LOGV("libsecril-client.so is loaded");
+        LOGV("libsamsung-ril-client.so is loaded");
 
         openClientRILD   = (HRilClient (*)(void))
                               dlsym(mSecRilLibHandle, "OpenClient_RILD");
@@ -166,7 +166,7 @@ void AudioHardware::loadRILD(void)
         if (!openClientRILD  || !disconnectRILD   || !closeClientRILD ||
             !isConnectedRILD || !connectRILD      ||
             !setCallVolume   || !setCallAudioPath || !setCallClockSync) {
-            LOGE("Can't load all functions from libsecril-client.so");
+            LOGE("Can't load all functions from libsamsung-ril-client.so");
 
             dlclose(mSecRilLibHandle);
             mSecRilLibHandle = NULL;
@@ -180,7 +180,7 @@ void AudioHardware::loadRILD(void)
             }
         }
     } else {
-        LOGE("Can't load libsecril-client.so");
+        LOGE("Can't load libsamsung-ril-client.so");
     }
 }
 
diff --git a/system.prop b/system.prop
index e31d565..712be39 100644
--- a/system.prop
+++ b/system.prop
@@ -2,7 +2,7 @@
 # system.prop for smdkc110
 #
 
-rild.libpath=/vendor/lib/libsec-ril.so
+rild.libpath=/system/lib/libsamsung-ril.so
 rild.libargs=-d /dev/ttyS0
 ro.sf.lcd_density=240
 
-- 
cgit v1.1