From e5c797b1d159b42777fc260be30b70595385e676 Mon Sep 17 00:00:00 2001
From: followmsi <followmsi@gmail.com>
Date: Thu, 23 Nov 2017 10:39:57 +0100
Subject: [PATCH] Revert "deb: add rild_socket shim"

This reverts commit 49426332faea7679d67dea546589e3dcaa1fc1e9.
---
 device.mk              |  3 +--
 init.deb.rc            |  2 --
 libshims/Android.mk    | 24 ------------------------
 libshims/rild_socket.c | 19 -------------------
 4 files changed, 1 insertion(+), 47 deletions(-)
 delete mode 100644 libshims/Android.mk
 delete mode 100644 libshims/rild_socket.c

diff --git a/device.mk b/device.mk
index 17a599f..cebc230 100644
--- a/device.mk
+++ b/device.mk
@@ -18,8 +18,7 @@
 PRODUCT_PACKAGES := \
     rild \
     CarrierConfig \
-    BasicSmsReceiver \
-    rild_socket
+    BasicSmsReceiver
 
 PRODUCT_COPY_FILES := \
     device/asus/deb/fstab.deb:root/fstab.flo \
diff --git a/init.deb.rc b/init.deb.rc
index bec7adf..838f25a 100644
--- a/init.deb.rc
+++ b/init.deb.rc
@@ -26,8 +26,6 @@ on init
     symlink /sdcard /storage/sdcard0
 
 on init
-    export LD_SHIM_LIBS /system/vendor/lib/libril-qc-qmi-1.so|rild_socket.so
-
     # Set permissions for persist partition
     mkdir /persist 0771 system system
     mkdir /firmware 0771 system system
diff --git a/libshims/Android.mk b/libshims/Android.mk
deleted file mode 100644
index b6c1079..0000000
--- a/libshims/Android.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) 2016 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 := rild_socket.c
-
-LOCAL_MODULE := rild_socket
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/libshims/rild_socket.c b/libshims/rild_socket.c
deleted file mode 100644
index 28c6e44..0000000
--- a/libshims/rild_socket.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (C) 2017 The LineageOS 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.
- */
-
-#define MAX_SOCKET_NAME_LENGTH 6
-
-char rild[MAX_SOCKET_NAME_LENGTH] = "rild";