z2_plus: Squash revert of libshims

Signed-off-by: dd3boh <dade.garberi@gmail.com>

5 files changed, 2 insertions, 78 deletions

diff --git a/device.mk b/device.mk
index d17e37d..59a6811 100755
--- a/device.mk
+++ b/device.mk
@@ -157,8 +157,7 @@ PRODUCT_PACKAGES += \
     android.hardware.gnss@1.0-impl \
     gps.msm8996 \
     libcurl \
-    libgnsspps \
-    libshims_get_process_name
+    libgnsspps
 
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/gps/etc/flp.conf:system/etc/flp.conf \
@@ -279,8 +278,7 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     librmnetctl \
     libxml2 \
-    libprotobuf-cpp-full \
-    rild_socket
+    libprotobuf-cpp-full
 
 # Sensors
 PRODUCT_PACKAGES += \
diff --git a/libshims/Android.mk b/libshims/Android.mk
deleted file mode 100644
index 0c4f110..0000000
--- a/libshims/Android.mk
+++ /dev/null
@@ -1,33 +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 := get_process_name.c
-
-LOCAL_MODULE := libshims_get_process_name
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)
-
-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/get_process_name.c b/libshims/get_process_name.c
deleted file mode 100644
index a25985c..0000000
--- a/libshims/get_process_name.c
+++ /dev/null
@@ -1,21 +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.
- */
-
-static const char* process_name = "unknown";
-
-const char* get_process_name(void) {
-    return process_name;
-}
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";
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index b421b81..fe960f5 100755
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -35,7 +35,6 @@ on early-init
     write /sys/module/msm_performance/parameters/cpu_max_freq "0:1300000 1:1300000 2:1300000 3:1300000"
 
 on init
-    export LD_SHIM_LIBS /system/vendor/lib64/lib-imsvt.so|libshims_ims.so:/system/vendor/lib64/libizat_core.so|libshims_get_process_name.so:/system/vendor/lib64/libril-qc-qmi-1.so|rild_socket.so
 
     # Set permissions for persist partition
     mkdir /persist 0771 system system