diff --git a/device.mk b/device.mk index 7971286..008a635 100644 --- a/device.mk +++ b/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 += \ diff --git a/rild/Android.mk b/rild/Android.mk deleted file mode 100644 index 927bc19..0000000 --- a/rild/Android.mk +++ /dev/null @@ -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) - diff --git a/rild/rild.rc b/rild/rild.rc deleted file mode 100644 index 968cd65..0000000 --- a/rild/rild.rc +++ /dev/null @@ -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 diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 9bb69ff..79dccef 100644 --- a/rootdir/etc/init.qcom.rc +++ b/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