Ril updates

diff --git a/device-common.mk b/device-common.mk
index 7a36b82895d768b5cdea163b75ae673721e05981..6dec30ac00b7d3e5625307cfc96efe6338b24e02 100644 (file)
--- a/device-common.mk
+++ b/device-common.mk
@@ -253,9 +253,6 @@ PRODUCT_PACKAGES += \
     android.hardware.radio@1.4 \
     libxml2
 
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/ramdisk/etc/ril_config.sh:$(TARGET_COPY_OUT_VENDOR)/etc/ril_config.sh
-
 # SamsungDoze
 PRODUCT_PACKAGES += \
     SamsungDoze

diff --git a/extract-files.sh b/extract-files.sh
index 469d4034c19ab41a259951b4bc9100c340de6c45..a206f3a9876654f22c46c92ba298074ce0a40c1f 100755 (executable)
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -100,6 +100,11 @@ sed -i "s/SSLv3_client_method/SSLv23_method\x00\x00\x00\x00\x00\x00/" $BLOB_ROOT
 "${PATCHELF}" --remove-needed libhidltransport.so $BLOB_ROOT/vendor/lib64/hw/vendor.samsung.hardware.gnss@1.0-impl.so
 "${PATCHELF}" --remove-needed libhidltransport.so $BLOB_ROOT/vendor/lib64/libskeymaster3device.so
 "${PATCHELF}" --remove-needed libhidltransport.so $BLOB_ROOT/vendor/lib64/sensors.sensorhub.so
+"${PATCHELF}" --remove-needed libhidltransport.so $BLOB_ROOT/vendor/lib64/libsec-ril-dsds.so
+"${PATCHELF}" --remove-needed libhidltransport.so $BLOB_ROOT/vendor/lib64/libsec-ril.so
+"${PATCHELF}" --remove-needed libhidltransport.so $BLOB_ROOT/vendor/lib/libsec-ril-dsds.so
+"${PATCHELF}" --remove-needed libhidltransport.so $BLOB_ROOT/vendor/lib/libsec-ril.so
+
 # Remove libhwbinder dependencie
 "${PATCHELF}" --remove-needed libhwbinder.so $BLOB_ROOT/lib/android.hardware.bluetooth.a2dp@1.0.so
 "${PATCHELF}" --remove-needed libhwbinder.so $BLOB_ROOT/lib/android.hardware.gnss@1.0.so
@@ -116,6 +121,11 @@ sed -i "s/SSLv3_client_method/SSLv23_method\x00\x00\x00\x00\x00\x00/" $BLOB_ROOT
 "${PATCHELF}" --remove-needed libhwbinder.so $BLOB_ROOT/vendor/bin/hw/android.hardware.drm@1.1-service.widevine
 "${PATCHELF}" --remove-needed libhwbinder.so $BLOB_ROOT/vendor/lib/libwvhidl.so
 "${PATCHELF}" --remove-needed libhwbinder.so $BLOB_ROOT/vendor/lib64/hw/vendor.samsung.hardware.gnss@1.0-impl.so
+"${PATCHELF}" --remove-needed libhwbinder.so $BLOB_ROOT/vendor/lib64/libsec-ril-dsds.so
+"${PATCHELF}" --remove-needed libhwbinder.so $BLOB_ROOT/vendor/lib64/libsec-ril.so
+"${PATCHELF}" --remove-needed libhwbinder.so $BLOB_ROOT/vendor/lib/libsec-ril-dsds.so
+"${PATCHELF}" --remove-needed libhwbinder.so $BLOB_ROOT/vendor/lib/libsec-ril.so
+
 
 # Protobuf
 "${PATCHELF}" --replace-needed libprotobuf-cpp-lite.so libprotobuf-cpp-lite-v29.so $BLOB_ROOT/vendor/lib/libwvhidl.so
@@ -128,4 +138,7 @@ sed -i "s/SSLv3_client_method/SSLv23_method\x00\x00\x00\x00\x00\x00/" $BLOB_ROOT
 "${PATCHELF}" --replace-needed libvndsecril-client.so libsecril-client.so $BLOB_ROOT/vendor/lib/libwrappergps.so
 "${PATCHELF}" --replace-needed libvndsecril-client.so libsecril-client.so $BLOB_ROOT/vendor/lib64/libwrappergps.so
 
+"${PATCHELF}" --replace-needed libvndsecril-client.so libsecril-client.so $BLOB_ROOT/lib/libaudio-ril.so
+"${PATCHELF}" --replace-needed libvndsecril-client.so libsecril-client.so $BLOB_ROOT/lib/hw/audio.primary.universal8895.so
+
 "${MY_DIR}/setup-makefiles.sh"

diff --git a/proprietary-files.txt b/proprietary-files.txt
index b5d07ab000200165ef8cc0a3c1ea2c11ff5b5774..3331c78d2a757ee79b926dfa59d2500e19ab2864 100644 (file)
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -264,11 +264,10 @@ lib64/omx/libOMX.Exynos.VP9.Decoder.so
 lib64/omx/libOMX.Exynos.VP9.Encoder.so
 lib64/omx/libOMX.Exynos.WMV.Decoder.so
 
-# RIL
+# Radio - RIL - from N975FXXU6ETLL
+vendor/bin/secril_config_svc
 vendor/etc/init/init.vendor.rilchip.rc
 vendor/etc/init/init.vendor.rilcommon.rc
-
-# Radio - RIL - from N975FXXU6ETLL
 vendor/lib/libprotobuf-cpp-full-3.9.1.so
 vendor/lib64/libprotobuf-cpp-full-3.9.1.so
 vendor/bin/cbd

diff --git a/ramdisk/etc/init.baseband.rc b/ramdisk/etc/init.baseband.rc
index 85be7dc4b016882c97472692b3c6fdf6a901e5e2..2f7abe4394032a3e842b82c6fdd7baaf64292e72 100644 (file)
--- a/ramdisk/etc/init.baseband.rc
+++ b/ramdisk/etc/init.baseband.rc
@@ -7,7 +7,7 @@ on init
 on fs
     chown radio system /efs
     chmod 0771 /efs
-       restorecon_recursive /efs
+    restorecon_recursive /efs
     chown radio radio sys/devices/virtual/misc/multipdp/waketime
     chmod 0660 /sys/devices/virtual/misc/umts_dm0/dm_state
     chown radio system /sys/devices/virtual/misc/umts_dm0/dm_state
@@ -25,16 +25,10 @@ on fs
     chown radio system /efs/cpdebug/node
     chmod 0771 /efs/cpdebug/node
 
-on post-fs-data
     # For Samsung members
     chmod 0775 /data/log/err
     chown radio radio /data/log/err
 
-service cpboot-daemon /vendor/bin/cbd -d -tss310 -bm -mm -P platform/11120000.ufs/by-name/RADIO -n /efs
-    class main
-    user root
-    group radio cache inet misc audio sdcard_rw log sdcard_r shell system
-
 # SS/DS configuration
 on property:ro.multisim.simslotcount=*
    write /sys/module/modem_ctrl_ss310ap/parameters/ds_detect ${ro.multisim.simslotcount}
@@ -44,3 +38,8 @@ on property:ro.multisim.simslotcount=1
 
 on property:ro.multisim.simslotcount=2
     setprop persist.radio.multisim.config dsds
+
+service cpboot-daemon /vendor/bin/cbd -d -tss310 -bm -mm -P platform/11120000.ufs/by-name/RADIO -n /efs
+    class main
+    user root
+    group radio cache inet misc audio sdcard_rw log sdcard_r shell system

diff --git a/ramdisk/etc/init.samsungexynos8895.rc b/ramdisk/etc/init.samsungexynos8895.rc
index e3bfffecfdcb479764866318fcc7b8e2770d57bd..379c63be8e23ec61f64380805808f14a77f02f42 100644 (file)
--- a/ramdisk/etc/init.samsungexynos8895.rc
+++ b/ramdisk/etc/init.samsungexynos8895.rc
@@ -875,15 +875,6 @@ on fs
 # ARGOSD network_throughput
     chown system system /dev/network_throughput
 
-    start ril_config
-
-service ril_config /vendor/bin/sh /vendor/etc/ril_config.sh
-    class main
-    user radio
-    oneshot
-    disabled
-
-
 # ARGOSD
 service argos-daemon /vendor/bin/argosd
     class main

diff --git a/ramdisk/etc/ril_config.sh b/ramdisk/etc/ril_config.sh
deleted file mode 100644 (file)
index 062d6aa..0000000
--- a/ramdisk/etc/ril_config.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/vendor/bin/sh
-
-cat /efs/factory.prop | while read line
-do
-    setprop `echo $line | sed 's/=/ /'`
-done