sanders: use 64bit rild

* Partialy revert fa3d0d2dde4dd503edfc2977977d37c7cfaea7a3

device.mk

@@ -330,11 +330,7 @@ PRODUCT_PACKAGES += \
     libshim_ril \
     libprotobuf-cpp-full \
     libxml2 \
-    rild_socket \
-    rild_32
-
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/rild/rild.rc:system/vendor/etc/init/rild.rc
+    rild_socket
 
 #RIL
 PRODUCT_PACKAGES += \

rild/Android.mk

@@ -1,33 +0,0 @@
-# Copyright 2006 The Android Open Source Project
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
-	../../../../hardware/ril/rild/rild.c
-
-LOCAL_SHARED_LIBRARIES := \
-	libcutils \
-	libdl \
-	liblog \
-	libril
-
-# Temporary hack for broken vendor RILs.
-LOCAL_WHOLE_STATIC_LIBRARIES := \
-	librilutils_static
-
-LOCAL_CFLAGS := -DRIL_SHLIB
-LOCAL_CFLAGS += -Wall -Wextra -Werror
-
-ifeq ($(SIM_COUNT), 2)
-    LOCAL_CFLAGS += -DANDROID_MULTI_SIM
-    LOCAL_CFLAGS += -DANDROID_SIM_COUNT_2
-endif
-
-LOCAL_MODULE_RELATIVE_PATH := hw
-LOCAL_PROPRIETARY_MODULE := true
-LOCAL_32_BIT_ONLY := true
-LOCAL_MODULE := rild_32
-
-include $(BUILD_EXECUTABLE)
-

rild/rild.rc

@@ -1,5 +0,0 @@
-service ril-daemon /vendor/bin/hw/rild_32
-    class main
-    user radio
-    group radio cache inet misc audio log readproc wakelock
-    capabilities BLOCK_SUSPEND NET_ADMIN NET_RAW

rootdir/etc/init.qcom.rc

@@ -856,7 +856,7 @@ on property:ro.data.large_tcp_window_size=true
     # Adjust socket buffer to enlarge TCP receive window for high bandwidth (e.g. DO-RevB)
     write /proc/sys/net/ipv4/tcp_adv_win_scale  2
 
-service ril-daemon2 /vendor/bin/hw/rild_32 -c 2
+service ril-daemon2 /vendor/bin/hw/rild -c 2
     class main
     user radio
     group radio cache inet misc audio log readproc wakelock