From 273661b2a55599eb963ec335e12d0269c746b41a Mon Sep 17 00:00:00 2001
From: "Kevin F. Haggerty" <kevin.f.haggerty@gmail.com>
Date: Wed, 9 Nov 2016 07:58:37 -0700
Subject: [PATCH] klte-common: Move all the shims to libshim

* Rename libril_shim to libshim_ril for consistency

Change-Id: Ie86e5ceef2f90c5a9b9c9ebaacf49e48605794ed
---
 klte.mk                      |  2 +-
 libshims/Android.mk          |  9 +++++++++
 {ril => libshims}/ril_shim.c |  0
 ril/Android.mk               | 13 -------------
 rootdir/etc/init.qcom.rc     |  2 +-
 5 files changed, 11 insertions(+), 15 deletions(-)
 rename {ril => libshims}/ril_shim.c (100%)
 delete mode 100644 ril/Android.mk

diff --git a/klte.mk b/klte.mk
index 70765bd..ee50909 100644
--- a/klte.mk
+++ b/klte.mk
@@ -109,7 +109,7 @@ PRODUCT_PACKAGES += \
 
 # Radio
 PRODUCT_PACKAGES += \
-    libril_shim \
+    libshim_ril \
     libprotobuf-cpp-full
 
 # Ramdisk
diff --git a/libshims/Android.mk b/libshims/Android.mk
index df5427b..7840c03 100644
--- a/libshims/Android.mk
+++ b/libshims/Android.mk
@@ -1,8 +1,17 @@
 LOCAL_PATH := $(call my-dir)
 
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := ril_shim.c
+LOCAL_SHARED_LIBRARIES := liblog libcutils libbinder libutils
+LOCAL_MODULE := libshim_ril
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+include $(BUILD_SHARED_LIBRARY)
+
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := wvm_shim.cpp
 LOCAL_SHARED_LIBRARIES := libstagefright_foundation
 LOCAL_MODULE := libshim_wvm
 LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 include $(BUILD_SHARED_LIBRARY)
diff --git a/ril/ril_shim.c b/libshims/ril_shim.c
similarity index 100%
rename from ril/ril_shim.c
rename to libshims/ril_shim.c
diff --git a/ril/Android.mk b/ril/Android.mk
deleted file mode 100644
index ae97e0a..0000000
--- a/ril/Android.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SHARED_LIBRARIES := liblog libcutils libbinder libutils
-
-LOCAL_SRC_FILES := \
-    ril_shim.c
-
-LOCAL_MODULE := libril_shim
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index c60f79d..6b6a6f8 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -29,7 +29,7 @@ import init.qcom.usb.rc
 import init.target.rc
 
 on early-init
-    export LD_SHIM_LIBS "/system/lib/libril.so|libril_shim.so:/system/vendor/lib/libwvm.so|libshim_wvm.so"
+    export LD_SHIM_LIBS "/system/lib/libril.so|libshim_ril.so:/system/vendor/lib/libwvm.so|libshim_wvm.so"
 
     mount debugfs debugfs /sys/kernel/debug
     chmod 0755 /sys/kernel/debug