msm8996: Switch to source build RIL

Change-Id: Ic20311ab93898982131e06e57c6616d4c0f7bab6

7 files changed, 0 insertions, 191 deletions

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index f15cbe0..03a53b4 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -169,7 +169,6 @@ BOARD_USES_QC_TIME_SERVICES := true
 TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/fstab.qcom
 
 # RIL
-BOARD_RIL_CLASS := ../../../device/lge/msm8996-common/ril/
 TARGET_RIL_VARIANT := caf
 
 # SELinux policies
diff --git a/liblge/Android.mk b/liblge/Android.mk
deleted file mode 100644
index c033dcf..0000000
--- a/liblge/Android.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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 := \
-    lge_ril.cpp
-
-LOCAL_SHARED_LIBRARIES := libbinder
-
-LOCAL_MODULE := liblge
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-
-LOCAL_CFLAGS_arm64 += -DLIBLGE_64BIT
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/liblge/lge_ril.cpp b/liblge/lge_ril.cpp
deleted file mode 100644
index d382031..0000000
--- a/liblge/lge_ril.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.
- */
-
-#include <stdlib.h>
-
-#ifdef LIBLGE_64BIT
-extern "C" int _ZNK7android6Parcel10readUint64EPm(uint32_t *pArg);
-
-extern "C" int _ZNK7android6Parcel10readuInt64EPm(uint32_t *pArg) {
-    return _ZNK7android6Parcel10readUint64EPm(pArg);
-}
-#endif
-
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 55de6ce..0991be1 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -72,27 +72,6 @@ etc/firmware/leia_pm4_470.fw
 # NFC firmware
 vendor/firmware/libpn548ad_fw.so
 
-# Radio
-bin/rild
-lib64/libril.so
-lib64/librilutils.so
-lib64/libuicc.so
-
-# Radio - VSS
-lib64/libvss_bsp_qcci.so
-lib64/libvss_common_core.so
-lib64/libvss_common_idl.so
-lib64/libvss_common_iface.so
-lib64/libvss_dmi_qcci.so
-lib64/libvss_gnss_qcci.so
-lib64/libvss_ims_qcci.so
-lib64/libvss_nv_core.so
-lib64/libvss_nv_idl.so
-lib64/libvss_nv_iface.so
-lib64/libvss_resim_core.so
-lib64/libvss_resim_idl.so
-lib64/libvss_resim_iface.so
-
 # Radio firmware
 vendor/firmware/image/modem_pr/mcfg/configs/mcfg_hw/generic/common/default/default/mcfg_hw.mbn|58df6d1657b77154cc3504220727d936df4a35dc
 vendor/firmware/image/modem_pr/mcfg/configs/mcfg_hw/generic/common/mdm9x45/ss/mcfg_hw.mbn|75ee9f6b2f499f1b868df1f0051377f12b3ff8ad
diff --git a/ril/telephony/java/com/android/internal/telephony/LgeLteRIL.java b/ril/telephony/java/com/android/internal/telephony/LgeLteRIL.java
deleted file mode 100644
index 428a291..0000000
--- a/ril/telephony/java/com/android/internal/telephony/LgeLteRIL.java
+++ /dev/null
@@ -1,108 +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.
- */
-
-package com.android.internal.telephony;
-
-import static com.android.internal.telephony.RILConstants.*;
-
-import android.content.Context;
-import android.os.Message;
-import android.os.Parcel;
-
-/**
- * Custom Qualcomm RIL for LG G5
- *
- * {@hide}
- */
-public class LgeLteRIL extends RIL implements CommandsInterface {
-
-    public static final int RIL_UNSOL_AVAILABLE_RAT = 1054;
-    public static final int RIL_UNSOL_LOG_RF_BAND_INFO = 1165;
-    public static final int RIL_UNSOL_LTE_REJECT_CAUSE = 1187;
-
-    public LgeLteRIL(Context context, int preferredNetworkType, int cdmaSubscription) {
-        super(context, preferredNetworkType, cdmaSubscription, null);
-    }
-
-    public LgeLteRIL(Context context, int preferredNetworkType,
-            int cdmaSubscription, Integer instanceId) {
-        super(context, preferredNetworkType, cdmaSubscription, instanceId);
-    }
-
-    static String
-    lgeResponseToString(int request)
-    {
-        switch(request) {
-            case RIL_UNSOL_AVAILABLE_RAT: return "RIL_UNSOL_AVAILABLE_RAT";
-            case RIL_UNSOL_LOG_RF_BAND_INFO: return "RIL_UNSOL_LOG_RF_BAND_INFO";
-            case RIL_UNSOL_LTE_REJECT_CAUSE: return "RIL_UNSOL_LTE_REJECT_CAUSE";
-            default: return "<unknown response>";
-        }
-    }
-
-    protected void lgeUnsljLogRet(int response, Object ret) {
-        riljLog("[LGE-UNSL]< " + lgeResponseToString(response) + " " + retToString(response, ret));
-    }
-
-    @Override
-    protected void
-    processUnsolicited (Parcel p, int type) {
-        Object ret;
-        int dataPosition = p.dataPosition(); // save off position within the Parcel
-        int response = p.readInt();
-
-        switch(response) {
-            case RIL_UNSOL_AVAILABLE_RAT: ret = responseInts(p); break;
-            case RIL_UNSOL_LOG_RF_BAND_INFO: ret = responseInts(p); break;
-            case RIL_UNSOL_LTE_REJECT_CAUSE: ret = responseInts(p); break;
-            default:
-                // Rewind the Parcel
-                p.setDataPosition(dataPosition);
-                // Forward responses that we are not overriding to the super class
-                super.processUnsolicited(p, type);
-                return;
-        }
-
-        switch(response) {
-            case RIL_UNSOL_AVAILABLE_RAT:
-                if (RILJ_LOGD) lgeUnsljLogRet(response, ret);
-                break;
-            case RIL_UNSOL_LOG_RF_BAND_INFO:
-                if (RILJ_LOGD) lgeUnsljLogRet(response, ret);
-                break;
-            case RIL_UNSOL_LTE_REJECT_CAUSE:
-                if (RILJ_LOGD) lgeUnsljLogRet(response, ret);
-                break;
-        }
-    }
-
-    @Override
-    public void
-    setNetworkSelectionModeManual(String operatorNumeric, Message response) {
-        RILRequest rr
-                = RILRequest.obtain(RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL,
-                                    response);
-
-        if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
-                    + " " + operatorNumeric);
-
-        rr.mParcel.writeInt(2);
-        rr.mParcel.writeString(operatorNumeric);
-        rr.mParcel.writeString("2"); // NOCHANGE
-
-        send(rr);
-    }
-}
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 0862512..bea0cbf 100755
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -42,9 +42,6 @@ on init
     # NXP HAL expects /dev/nq-nci
     symlink /dev/pn547 /dev/nq-nci
 
-    # Load LGE Symbols
-    export LD_SHIM_LIBS /system/lib64/libril.so|liblge.so
-
 on early-boot
     # Set RLIMIT_MEMLOCK to 64MB
     setrlimit 8 67108864 67108864
diff --git a/system.prop b/system.prop
index a1b0c62..4ecb236 100644
--- a/system.prop
+++ b/system.prop
@@ -122,8 +122,6 @@ persist.data.qmi.adb_logmask=0
 persist.net.doxlat=true
 persist.oem.dump=0
 persist.radio.ignore_dom_time=5
-ro.ril.telephony.mqanelements=5
-ro.telephony.ril_class=LgeLteRIL
 
 # Radio - Data/RMNet
 persist.data.df.agg.dl_pkt=10