deb: move proprietary modules to vendor

Change-Id: Ie51036d03f391d4581e555980fed2e7afe885b41

3 files changed, 22 insertions, 215 deletions

diff --git a/init.deb.rc b/init.deb.rc
index b2a88d0..6f12423 100644
--- a/init.deb.rc
+++ b/init.deb.rc
@@ -218,13 +218,12 @@ on post-fs-data
 
     setprop vold.post_fs_data_done 1
 
-service irsc_util /system/bin/irsc_util "/vendor/etc/sec_config"
+service irsc_util /vendor/bin/irsc_util "/vendor/etc/sec_config"
     class main
     user root
     oneshot
 
-
-service rmt_storage /system/bin/rmt_storage
+service rmt_storage /vendor/bin/rmt_storage
     class main
     user root
     group system wakelock
@@ -242,23 +241,23 @@ on property:bluetooth.hciattach=true
 on property:bluetooth.hciattach=false
     setprop bluetooth.status off
 
-service bridgemgrd /system/bin/bridgemgrd
+service bridgemgrd /vendor/bin/bridgemgrd
     class main
     user radio
     group radio
 
 # QMUX must be in multiple groups to support external process connections
-service qmuxd /system/bin/qmuxd
+service qmuxd /vendor/bin/qmuxd
     class main
     user root
     group radio audio bluetooth wakelock gps
 
-service ks_checker /system/bin/kickstart_checker.sh
+service ks_checker /vendor/bin/kickstart_checker.sh
     class core
     group system
     oneshot
 
-service kickstart /system/bin/qcks -i /firmware/image/ -r /data/tombstones/mdm/
+service kickstart /vendor/bin/qcks -i /firmware/image/ -r /data/tombstones/mdm/
     class core
     user system
     group system wakelock
@@ -275,7 +274,7 @@ on property:gsm.radio.kickstart=off
 on property:ril.asus_debugger_running=1
     start asus-dbug-d
 
-service netmgrd /system/bin/netmgrd
+service netmgrd /vendor/bin/netmgrd
     class main
     group radio wakelock
 
@@ -287,7 +286,7 @@ service ril-daemon /vendor/bin/hw/rild
     user root
     group radio cache inet misc audio log readproc wakelock qcom_diag net_raw
 
-service sensors /system/bin/sensors.qcom
+service sensors /vendor/bin/sensors.qcom
     class late_start
     user root
     group root wakelock
@@ -318,16 +317,16 @@ service charger /sbin/healthd -c
     critical
     seclabel u:r:healthd:s0
 
-service thermald /system/bin/thermald
+service thermald /vendor/bin/thermald
     class main
     group radio 
 
-service mpdecision /system/bin/mpdecision --avg_comp
+service mpdecision /vendor/bin/mpdecision --avg_comp
     class main
     user root
     group root readproc system
 
-service qcamerasvr /system/bin/mm-qcamera-daemon
+service qcamerasvr /vendor/bin/mm-qcamera-daemon
     class late_start
     user camera
     group camera system inet input
@@ -344,11 +343,11 @@ service bdAddrLoader /vendor/bin/bdAddrLoader -f /persist/bluetooth/.bdaddr -h -
     group system bluetooth
     oneshot
 
-service qseecomd /system/bin/qseecomd
+service qseecomd /vendor/bin/qseecomd
     class late_start
     user system
     group system
 
-service diag_mdlog /system/bin/diag_mdlog -s 100
+service diag_mdlog /vendor/bin/diag_mdlog -s 100
     class late_start
     disabled
diff --git a/proprietary-blobs.txt b/proprietary-blobs.txt
index 17bfc37..3831465 100644
--- a/proprietary-blobs.txt
+++ b/proprietary-blobs.txt
@@ -12,198 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This file is generated by device/common/generate-blob-lists.sh - DO NOT EDIT
-
-bin/ATFWD-daemon
-bin/bridgemgrd
-bin/btnvtool
-bin/diag_klog
-bin/diag_mdlog
-bin/ds_fmc_appd
-bin/efsks
-bin/hci_qcomm_init
-bin/irsc_util
-bin/ks
-bin/mm-qcamera-app
-bin/mm-qcamera-daemon
-bin/mm-qjpeg-enc-test
-bin/mm-qomx-ienc-test
-bin/mpdecision
-bin/netmgrd
-bin/nl_listener
-bin/port-bridge
-bin/qcks
-bin/qmuxd
-bin/qseecomd
-bin/radish
-bin/rmt_storage
-bin/sensors.qcom
-bin/thermald
-bin/usbhub
-bin/usbhub_init
-etc/DxHDCP.cfg
-etc/firmware/vidc.b00
-etc/firmware/vidc.b01
-etc/firmware/vidc.b02
-etc/firmware/vidc.b03
-etc/firmware/vidc.mdt
-etc/firmware/vidcfw.elf
-etc/firmware/vidc_1080p.fw
-etc/gps.conf
-vendor/lib/egl/eglsubAndroid.so
-vendor/lib/egl/libEGL_adreno.so
-vendor/lib/egl/libGLESv1_CM_adreno.so
-vendor/lib/egl/libGLESv2_adreno.so
-vendor/lib/egl/libplayback_adreno.so
-vendor/lib/egl/libq3dtools_adreno.so
-lib/hw/flp.msm8960.so
-lib/hw/gps.msm8960.so
-lib/hw/sensors.msm8960.so
-lib/libacdbdata.so
-lib/libacdbloader.so
-vendor/lib/libadreno_utils.so
-lib/libAKM.so
-lib/libaudcal.so
-lib/libaudioalsa.so
-vendor/lib/libC2D2.so
-vendor/lib/libc2d30-a3xx.so
-vendor/lib/libc2d30.so
-vendor/lib/libCB.so
-lib/libchromatix_ov5693_common.so
-lib/libchromatix_ov5693_default_video.so
-lib/libchromatix_ov5693_preview.so
-lib/libCommandSvc.so
-lib/libconfigdb.so
-lib/libcsd-client.so
-lib/libdiag.so
-lib/libdrmdiag.so
-lib/libdrmfs.so
-lib/libdrmtime.so
-lib/libdsi_netctrl.so
-lib/libdsprofile.so
-lib/libdss.so
-lib/libdsucsd.so
-lib/libdsutils.so
-lib/libDxHdcp.so
-lib/libgps.utils.so
-vendor/lib/libgsl.so
-lib/libI420colorconvert.so
-lib/libidl.so
-vendor/lib/libllvm-qcom.so
-vendor/lib/libbccQTI.so
-lib/libloc_core.so
-lib/libloc_eng.so
-lib/libmm-abl.so
-lib/libmm-color-convertor.so
-lib/libmmcamera2_stats_algorithm.so
-lib/libmmcamera_image_stab.so
-lib/libmmcamera_mi1040.so
-lib/libmmcamera_ov5693.so
-lib/libnetmgr.so
-lib/libqcci_legacy.so
-lib/libqdi.so
-lib/libqdp.so
-lib/libqmi.so
-lib/libqmiservices.so
-lib/libqmi_cci.so
-lib/libqmi_client_qmux.so
-lib/libqmi_common_so.so
-lib/libqmi_csi.so
-lib/libqmi_csvt_srvc.so
-lib/libqmi_encdec.so
-lib/libQSEEComAPI.so
-lib/libril-qc-qmi-1.so
-lib/libril-qcril-hook-oem.so
-vendor/lib/libRSDriver_adreno.so
-vendor/lib/librs_adreno.so
-vendor/lib/librs_adreno_sha1.so
-vendor/lib/libsc-a3xx.so
-lib/libsensor1.so
-lib/libsensor_reg.so
-lib/libsensor_user_cal.so
-lib/libstagefright_hdcp.so
-vendor/lib/libWVphoneAPI.so
-lib/libxml.so
-vendor/firmware/a300_pfp.fw
-vendor/firmware/a300_pm4.fw
-vendor/firmware/bcm2079x-b5_firmware.ncd
-vendor/firmware/bcm2079x-b5_pre_firmware.ncd
-vendor/firmware/discretix/dxhdcp2.b00
-vendor/firmware/discretix/dxhdcp2.b01
-vendor/firmware/discretix/dxhdcp2.b02
-vendor/firmware/discretix/dxhdcp2.b03
-vendor/firmware/discretix/dxhdcp2.mdt
-vendor/firmware/dsps.b00
-vendor/firmware/dsps.b01
-vendor/firmware/dsps.b02
-vendor/firmware/dsps.b03
-vendor/firmware/dsps.b04
-vendor/firmware/dsps.b05
-vendor/firmware/dsps.mdt
-vendor/firmware/gss.b00
-vendor/firmware/gss.b01
-vendor/firmware/gss.b02
-vendor/firmware/gss.b03
-vendor/firmware/gss.b04
-vendor/firmware/gss.b05
-vendor/firmware/gss.b06
-vendor/firmware/gss.b07
-vendor/firmware/gss.b08
-vendor/firmware/gss.b09
-vendor/firmware/gss.b10
-vendor/firmware/gss.b11
-vendor/firmware/gss.mdt
-vendor/firmware/keymaster/keymaster.b00
-vendor/firmware/keymaster/keymaster.b01
-vendor/firmware/keymaster/keymaster.b02
-vendor/firmware/keymaster/keymaster.b03
-vendor/firmware/keymaster/keymaster.mdt
-vendor/firmware/q6.b00
-vendor/firmware/q6.b01
-vendor/firmware/q6.b03
-vendor/firmware/q6.b04
-vendor/firmware/q6.b05
-vendor/firmware/q6.b06
-vendor/firmware/q6.mdt
-vendor/firmware/tzapps.b00
-vendor/firmware/tzapps.b01
-vendor/firmware/tzapps.b02
-vendor/firmware/tzapps.b03
-vendor/firmware/tzapps.mdt
-vendor/firmware/wcnss.b00
-vendor/firmware/wcnss.b01
-vendor/firmware/wcnss.b02
-vendor/firmware/wcnss.b04
-vendor/firmware/wcnss.b05
-vendor/firmware/wcnss.mdt
-vendor/lib/drm/libdrmwvmplugin.so
-vendor/lib/libdrmdecrypt.so
-vendor/lib/libgemini.so
-vendor/lib/libgeofence.so
-vendor/lib/libimage-jpeg-enc-omx-comp.so
-vendor/lib/libimage-omx-common.so
-vendor/lib/libizat_core.so
-vendor/lib/libloc_api_v02.so
-vendor/lib/libloc_ds_api.so
-vendor/lib/libmmcamera2_c2d_module.so
-vendor/lib/libmmcamera2_cpp_module.so
-vendor/lib/libmmcamera2_iface_modules.so
-vendor/lib/libmmcamera2_imglib_modules.so
-vendor/lib/libmmcamera2_isp_modules.so
-vendor/lib/libmmcamera2_pproc_modules.so
-vendor/lib/libmmcamera2_sensor_modules.so
-vendor/lib/libmmcamera2_stats_modules.so
-vendor/lib/libmmcamera2_vpe_module.so
-vendor/lib/libmmcamera2_wnr_module.so
-vendor/lib/libmmcamera_faceproc.so
-vendor/lib/libmmcamera_imglib.so
-vendor/lib/libmmipl.so
-vendor/lib/libmmjpeg.so
-vendor/lib/libmmqjpeg_codec.so
-vendor/lib/libmmstillomx.so
-vendor/lib/liboemcamera.so
-vendor/lib/libqomx_jpegenc.so
-vendor/lib/libwvdrm_L1.so
-vendor/lib/libwvm.so
-vendor/lib/libWVStreamControlAPI_L1.so
-vendor/lib/mediadrm/libwvdrmengine.so
+lib/libril-qc-qmi-1.so:vendor/lib/libril-qc-qmi-1.so
+lib/libril-qcril-hook-oem.so:vendor/lib/libril-qcril-hook-oem.so
diff --git a/system.prop b/system.prop
index 51fd357..6c93e12 100644
--- a/system.prop
+++ b/system.prop
@@ -1,11 +1,12 @@
-#
-#set prefer network type
-#LTE, GSM, WCDMA(9)
-#
+=======
+# Telephony
+rild.libpath=/system/vendor/lib/libril-qc-qmi-1.so
+# Preferred network type - LTE, WCDMA, GSM
 ro.telephony.default_network=9
-telephony.lteOnGsmDevice=1
-telephony.lteOnCdmaDevice=1
 ro.telephony.get_imsi_from_sim=true
+telephony.lteOnGsmDevice=1
 DEVICE_PROVISIONED=1
+# Do not power down SIM card when modem is sent to Low Power Mode.
+persist.radio.apm_sim_not_pwdn=1
 #Display Traditional Chinese/Simplified Chinese carriers name
 persist.radio.use_cc_names=true