52 files changed, 50 insertions, 64 deletions

diff --git a/ham/Android.mk b/ham/Android.mk
index ed3ab0b..d570b60 100644
--- a/ham/Android.mk
+++ b/ham/Android.mk
@@ -19,47 +19,40 @@ LOCAL_PATH := $(call my-dir)
 ifeq ($(TARGET_DEVICE),ham)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := libwpa_qmi_eap_proxy
-LOCAL_MODULE_OWNER := zuk
-LOCAL_SRC_FILES := proprietary/lib/libwpa_qmi_eap_proxy.so
-LOCAL_MULTILIB := 32
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_MODULE_SUFFIX := .so
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
 LOCAL_MODULE := TimeService
 LOCAL_MODULE_OWNER := zuk
-LOCAL_SRC_FILES := proprietary/app/TimeService/TimeService.apk
+LOCAL_SRC_FILES := proprietary/vendor/app/TimeService/TimeService.apk
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := APPS
 LOCAL_DEX_PREOPT := false
 LOCAL_MODULE_SUFFIX := .apk
+LOCAL_VENDOR_MODULE := true
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := shutdownlistener
 LOCAL_MODULE_OWNER := zuk
-LOCAL_SRC_FILES := proprietary/app/shutdownlistener/shutdownlistener.apk
+LOCAL_SRC_FILES := proprietary/vendor/app/shutdownlistener/shutdownlistener.apk
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := APPS
 LOCAL_DEX_PREOPT := false
 LOCAL_MODULE_SUFFIX := .apk
+LOCAL_VENDOR_MODULE := true
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := qcrilmsgtunnel
 LOCAL_MODULE_OWNER := zuk
-LOCAL_SRC_FILES := proprietary/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
+LOCAL_SRC_FILES := proprietary/vendor/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := APPS
 LOCAL_DEX_PREOPT := false
 LOCAL_MODULE_SUFFIX := .apk
 LOCAL_PRIVILEGED_MODULE := true
+LOCAL_VENDOR_MODULE := true
 include $(BUILD_PREBUILT)
 
 endif
diff --git a/ham/ham-vendor.mk b/ham/ham-vendor.mk
index 7747548..f0588d4 100644
--- a/ham/ham-vendor.mk
+++ b/ham/ham-vendor.mk
@@ -15,37 +15,37 @@
 # This file is generated by device/zuk/ham/setup-makefiles.sh
 
 PRODUCT_COPY_FILES += \
-    vendor/zuk/ham/proprietary/bin/adsprpcd:system/bin/adsprpcd \
-    vendor/zuk/ham/proprietary/bin/btnvtool:system/bin/btnvtool \
-    vendor/zuk/ham/proprietary/bin/diag_mdlog:system/bin/diag_mdlog \
-    vendor/zuk/ham/proprietary/bin/hci_qcomm_init:system/bin/hci_qcomm_init \
-    vendor/zuk/ham/proprietary/bin/irsc_util:system/bin/irsc_util \
-    vendor/zuk/ham/proprietary/bin/mm-qcamera-daemon:system/bin/mm-qcamera-daemon \
-    vendor/zuk/ham/proprietary/bin/mpdecision:system/bin/mpdecision \
-    vendor/zuk/ham/proprietary/bin/netmgrd:system/bin/netmgrd \
-    vendor/zuk/ham/proprietary/bin/qmuxd:system/bin/qmuxd \
-    vendor/zuk/ham/proprietary/bin/qseecomd:system/bin/qseecomd \
-    vendor/zuk/ham/proprietary/bin/radish:system/bin/radish \
-    vendor/zuk/ham/proprietary/bin/rfs_access:system/bin/rfs_access \
-    vendor/zuk/ham/proprietary/bin/rmt_storage:system/bin/rmt_storage \
-    vendor/zuk/ham/proprietary/bin/sensors.qcom:system/bin/sensors.qcom \
-    vendor/zuk/ham/proprietary/bin/time_daemon:system/bin/time_daemon \
-    vendor/zuk/ham/proprietary/etc/data/dsi_config.xml:system/etc/data/dsi_config.xml \
-    vendor/zuk/ham/proprietary/etc/data/netmgr_config.xml:system/etc/data/netmgr_config.xml \
-    vendor/zuk/ham/proprietary/etc/firmware/a330_pfp.fw:system/etc/firmware/a330_pfp.fw \
-    vendor/zuk/ham/proprietary/etc/firmware/a330_pm4.fw:system/etc/firmware/a330_pm4.fw \
-    vendor/zuk/ham/proprietary/etc/firmware/cpp_firmware_v1_1_1.fw:system/etc/firmware/cpp_firmware_v1_1_1.fw \
-    vendor/zuk/ham/proprietary/etc/firmware/cpp_firmware_v1_1_6.fw:system/etc/firmware/cpp_firmware_v1_1_6.fw \
-    vendor/zuk/ham/proprietary/etc/firmware/cpp_firmware_v1_2_0.fw:system/etc/firmware/cpp_firmware_v1_2_0.fw \
-    vendor/zuk/ham/proprietary/etc/firmware/venus.b00:system/etc/firmware/venus.b00 \
-    vendor/zuk/ham/proprietary/etc/firmware/venus.b01:system/etc/firmware/venus.b01 \
-    vendor/zuk/ham/proprietary/etc/firmware/venus.b02:system/etc/firmware/venus.b02 \
-    vendor/zuk/ham/proprietary/etc/firmware/venus.b03:system/etc/firmware/venus.b03 \
-    vendor/zuk/ham/proprietary/etc/firmware/venus.b04:system/etc/firmware/venus.b04 \
-    vendor/zuk/ham/proprietary/etc/firmware/venus.mbn:system/etc/firmware/venus.mbn \
-    vendor/zuk/ham/proprietary/etc/firmware/venus.mdt:system/etc/firmware/venus.mdt \
-    vendor/zuk/ham/proprietary/etc/permissions/qcnvitems.xml:system/etc/permissions/qcnvitems.xml \
-    vendor/zuk/ham/proprietary/etc/permissions/qcrilhook.xml:system/etc/permissions/qcrilhook.xml \
+    vendor/zuk/ham/proprietary/vendor/bin/adsprpcd:system/vendor/bin/adsprpcd \
+    vendor/zuk/ham/proprietary/vendor/bin/diag_mdlog:system/vendor/bin/diag_mdlog \
+    vendor/zuk/ham/proprietary/vendor/bin/hci_qcomm_init:system/vendor/bin/hci_qcomm_init \
+    vendor/zuk/ham/proprietary/vendor/bin/irsc_util:system/vendor/bin/irsc_util \
+    vendor/zuk/ham/proprietary/vendor/bin/loc_launcher:system/vendor/bin/loc_launcher \
+    vendor/zuk/ham/proprietary/vendor/bin/mm-qcamera-daemon:system/vendor/bin/mm-qcamera-daemon \
+    vendor/zuk/ham/proprietary/vendor/bin/mpdecision:system/vendor/bin/mpdecision \
+    vendor/zuk/ham/proprietary/vendor/bin/netmgrd:system/vendor/bin/netmgrd \
+    vendor/zuk/ham/proprietary/vendor/bin/qmuxd:system/vendor/bin/qmuxd \
+    vendor/zuk/ham/proprietary/vendor/bin/qseecomd:system/vendor/bin/qseecomd \
+    vendor/zuk/ham/proprietary/vendor/bin/radish:system/vendor/bin/radish \
+    vendor/zuk/ham/proprietary/vendor/bin/rfs_access:system/vendor/bin/rfs_access \
+    vendor/zuk/ham/proprietary/vendor/bin/rmt_storage:system/vendor/bin/rmt_storage \
+    vendor/zuk/ham/proprietary/vendor/bin/sensors.qcom:system/vendor/bin/sensors.qcom \
+    vendor/zuk/ham/proprietary/vendor/bin/time_daemon:system/vendor/bin/time_daemon \
+    vendor/zuk/ham/proprietary/vendor/etc/data/dsi_config.xml:system/vendor/etc/data/dsi_config.xml \
+    vendor/zuk/ham/proprietary/vendor/etc/data/netmgr_config.xml:system/vendor/etc/data/netmgr_config.xml \
+    vendor/zuk/ham/proprietary/vendor/firmware/a330_pfp.fw:system/vendor/firmware/a330_pfp.fw \
+    vendor/zuk/ham/proprietary/vendor/firmware/a330_pm4.fw:system/vendor/firmware/a330_pm4.fw \
+    vendor/zuk/ham/proprietary/vendor/firmware/cpp_firmware_v1_1_1.fw:system/vendor/firmware/cpp_firmware_v1_1_1.fw \
+    vendor/zuk/ham/proprietary/vendor/firmware/cpp_firmware_v1_1_6.fw:system/vendor/firmware/cpp_firmware_v1_1_6.fw \
+    vendor/zuk/ham/proprietary/vendor/firmware/cpp_firmware_v1_2_0.fw:system/vendor/firmware/cpp_firmware_v1_2_0.fw \
+    vendor/zuk/ham/proprietary/vendor/firmware/venus.b00:system/vendor/firmware/venus.b00 \
+    vendor/zuk/ham/proprietary/vendor/firmware/venus.b01:system/vendor/firmware/venus.b01 \
+    vendor/zuk/ham/proprietary/vendor/firmware/venus.b02:system/vendor/firmware/venus.b02 \
+    vendor/zuk/ham/proprietary/vendor/firmware/venus.b03:system/vendor/firmware/venus.b03 \
+    vendor/zuk/ham/proprietary/vendor/firmware/venus.b04:system/vendor/firmware/venus.b04 \
+    vendor/zuk/ham/proprietary/vendor/firmware/venus.mbn:system/vendor/firmware/venus.mbn \
+    vendor/zuk/ham/proprietary/vendor/firmware/venus.mdt:system/vendor/firmware/venus.mdt \
+    vendor/zuk/ham/proprietary/vendor/etc/permissions/qcnvitems.xml:system/vendor/etc/permissions/qcnvitems.xml \
+    vendor/zuk/ham/proprietary/vendor/etc/permissions/qcrilhook.xml:system/vendor/etc/permissions/qcrilhook.xml \
     vendor/zuk/ham/proprietary/etc/sensor_def_qcomdev.conf:system/etc/sensor_def_qcomdev.conf \
     vendor/zuk/ham/proprietary/etc/tfa98xx/TFA9890_N1B12_N1C3_v2.config:system/etc/tfa98xx/TFA9890_N1B12_N1C3_v2.config \
     vendor/zuk/ham/proprietary/etc/tfa98xx/TFA9890_N1C3_2_1_1.patch:system/etc/tfa98xx/TFA9890_N1C3_2_1_1.patch \
@@ -55,18 +55,19 @@ PRODUCT_COPY_FILES += \
     vendor/zuk/ham/proprietary/etc/tfa98xx/shenqi_music.preset:system/etc/tfa98xx/shenqi_music.preset \
     vendor/zuk/ham/proprietary/etc/tfa98xx/shenqi_speech.eq:system/etc/tfa98xx/shenqi_speech.eq \
     vendor/zuk/ham/proprietary/etc/tfa98xx/shenqi_speech.preset:system/etc/tfa98xx/shenqi_speech.preset \
-    vendor/zuk/ham/proprietary/framework/qcnvitems.jar:system/framework/qcnvitems.jar \
-    vendor/zuk/ham/proprietary/framework/qcrilhook.jar:system/framework/qcrilhook.jar \
-    vendor/zuk/ham/proprietary/lib/hw/fingerprint.msm8974.so:system/lib/hw/fingerprint.msm8974.so \
-    vendor/zuk/ham/proprietary/lib/lib_fpc_tac_shared.so:system/lib/lib_fpc_tac_shared.so \
-    vendor/zuk/ham/proprietary/lib/libdrmdecrypt.so:system/lib/libdrmdecrypt.so \
-    vendor/zuk/ham/proprietary/lib/libloc_api_v02.so:system/lib/libloc_api_v02.so \
-    vendor/zuk/ham/proprietary/lib/libloc_ds_api.so:system/lib/libloc_ds_api.so \
-    vendor/zuk/ham/proprietary/lib/libmdmdetect.so:system/lib/libmdmdetect.so \
-    vendor/zuk/ham/proprietary/lib/libmmcamera_interface.so:system/lib/libmmcamera_interface.so \
-    vendor/zuk/ham/proprietary/lib/libmmjpeg_interface.so:system/lib/libmmjpeg_interface.so \
-    vendor/zuk/ham/proprietary/lib/libqomx_core.so:system/lib/libqomx_core.so \
-    vendor/zuk/ham/proprietary/lib/libwcnss_qmi.so:system/lib/libwcnss_qmi.so \
+    vendor/zuk/ham/proprietary/vendor/framework/ConnectivityExt.jar:system/vendor/framework/ConnectivityExt.jar \
+    vendor/zuk/ham/proprietary/vendor/framework/qcnvitems.jar:system/vendor/framework/qcnvitems.jar \
+    vendor/zuk/ham/proprietary/vendor/framework/qcrilhook.jar:system/vendor/framework/qcrilhook.jar \
+    vendor/zuk/ham/proprietary/vendor/lib/hw/fingerprint.msm8974.so:system/vendor/lib/hw/fingerprint.msm8974.so \
+    vendor/zuk/ham/proprietary/vendor/lib/lib_fpc_tac_shared.so:system/vendor/lib/lib_fpc_tac_shared.so \
+    vendor/zuk/ham/proprietary/vendor/lib/libdrmdecrypt.so:system/vendor/lib/libdrmdecrypt.so \
+    vendor/zuk/ham/proprietary/vendor/lib/libloc_ds_api.so:system/vendor/lib/libloc_ds_api.so \
+    vendor/zuk/ham/proprietary/vendor/lib/libloc_api_v02.so:system/vendor/lib/libloc_api_v02.so \
+    vendor/zuk/ham/proprietary/vendor/lib/libmdmdetect.so:system/vendor/lib/libmdmdetect.so \
+    vendor/zuk/ham/proprietary/vendor/lib/libmmcamera_interface.so:system/vendor/lib/libmmcamera_interface.so \
+    vendor/zuk/ham/proprietary/vendor/lib/libmmjpeg_interface.so:system/vendor/lib/libmmjpeg_interface.so \
+    vendor/zuk/ham/proprietary/vendor/lib/libqomx_core.so:system/vendor/lib/libqomx_core.so \
+    vendor/zuk/ham/proprietary/vendor/lib/libwcnss_qmi.so:system/vendor/lib/libwcnss_qmi.so \
     vendor/zuk/ham/proprietary/vendor/bin/mm-pp-daemon:system/vendor/bin/mm-pp-daemon \
     vendor/zuk/ham/proprietary/vendor/bin/thermal-engine:system/vendor/bin/thermal-engine \
     vendor/zuk/ham/proprietary/vendor/lib/egl/eglsubAndroid.so:system/vendor/lib/egl/eglsubAndroid.so \
@@ -79,9 +80,7 @@ PRODUCT_COPY_FILES += \
     vendor/zuk/ham/proprietary/vendor/lib/hw/sensors.msm8974.so:system/vendor/lib/hw/sensors.msm8974.so \
     vendor/zuk/ham/proprietary/vendor/lib/libC2D2.so:system/vendor/lib/libC2D2.so \
     vendor/zuk/ham/proprietary/vendor/lib/libCB.so:system/vendor/lib/libCB.so \
-    vendor/zuk/ham/proprietary/vendor/lib/libDivxDrm.so:system/vendor/lib/libDivxDrm.so \
     vendor/zuk/ham/proprietary/vendor/lib/libHevcSwDecoder.so:system/vendor/lib/libHevcSwDecoder.so \
-    vendor/zuk/ham/proprietary/vendor/lib/libI420colorconvert.so:system/vendor/lib/libI420colorconvert.so \
     vendor/zuk/ham/proprietary/vendor/lib/libOmxAacDec.so:system/vendor/lib/libOmxAacDec.so \
     vendor/zuk/ham/proprietary/vendor/lib/libOmxAmrwbplusDec.so:system/vendor/lib/libOmxAmrwbplusDec.so \
     vendor/zuk/ham/proprietary/vendor/lib/libOmxEvrcDec.so:system/vendor/lib/libOmxEvrcDec.so \
@@ -90,9 +89,7 @@ PRODUCT_COPY_FILES += \
     vendor/zuk/ham/proprietary/vendor/lib/libOpenCL.so:system/vendor/lib/libOpenCL.so \
     vendor/zuk/ham/proprietary/vendor/lib/libQSEEComAPI.so:system/vendor/lib/libQSEEComAPI.so \
     vendor/zuk/ham/proprietary/vendor/lib/libRSDriver_adreno.so:system/vendor/lib/libRSDriver_adreno.so \
-    vendor/zuk/ham/proprietary/vendor/lib/libSHIMDivxDrm.so:system/vendor/lib/libSHIMDivxDrm.so \
     vendor/zuk/ham/proprietary/vendor/lib/libTimeService.so:system/vendor/lib/libTimeService.so \
-    vendor/zuk/ham/proprietary/vendor/lib/libWVStreamControlAPI_L3.so:system/vendor/lib/libWVStreamControlAPI_L3.so \
     vendor/zuk/ham/proprietary/vendor/lib/libacdbloader.so:system/vendor/lib/libacdbloader.so \
     vendor/zuk/ham/proprietary/vendor/lib/libacdbrtac.so:system/vendor/lib/libacdbrtac.so \
     vendor/zuk/ham/proprietary/vendor/lib/libactuator_rohm_bu63163.so:system/vendor/lib/libactuator_rohm_bu63163.so \
@@ -163,7 +160,6 @@ PRODUCT_COPY_FILES += \
     vendor/zuk/ham/proprietary/vendor/lib/liblqe.so:system/vendor/lib/liblqe.so \
     vendor/zuk/ham/proprietary/vendor/lib/libmm-abl-oem.so:system/vendor/lib/libmm-abl-oem.so \
     vendor/zuk/ham/proprietary/vendor/lib/libmm-abl.so:system/vendor/lib/libmm-abl.so \
-    vendor/zuk/ham/proprietary/vendor/lib/libmm-color-convertor.so:system/vendor/lib/libmm-color-convertor.so \
     vendor/zuk/ham/proprietary/vendor/lib/libmmcamera2_c2d_module.so:system/vendor/lib/libmmcamera2_c2d_module.so \
     vendor/zuk/ham/proprietary/vendor/lib/libmmcamera2_cpp_module.so:system/vendor/lib/libmmcamera2_cpp_module.so \
     vendor/zuk/ham/proprietary/vendor/lib/libmmcamera2_frame_algorithm.so:system/vendor/lib/libmmcamera2_frame_algorithm.so \
@@ -192,7 +188,6 @@ PRODUCT_COPY_FILES += \
     vendor/zuk/ham/proprietary/vendor/lib/libmmcamera_wavelet_lib.so:system/vendor/lib/libmmcamera_wavelet_lib.so \
     vendor/zuk/ham/proprietary/vendor/lib/libmmipl.so:system/vendor/lib/libmmipl.so \
     vendor/zuk/ham/proprietary/vendor/lib/libmmjpeg.so:system/vendor/lib/libmmjpeg.so \
-    vendor/zuk/ham/proprietary/vendor/lib/libmmosal.so:system/vendor/lib/libmmosal.so \
     vendor/zuk/ham/proprietary/vendor/lib/libmmqjpeg_codec.so:system/vendor/lib/libmmqjpeg_codec.so \
     vendor/zuk/ham/proprietary/vendor/lib/libnetmgr.so:system/vendor/lib/libnetmgr.so \
     vendor/zuk/ham/proprietary/vendor/lib/liboemcamera.so:system/vendor/lib/liboemcamera.so \
@@ -228,7 +223,6 @@ PRODUCT_COPY_FILES += \
     vendor/zuk/ham/proprietary/vendor/lib/libthermalioctl.so:system/vendor/lib/libthermalioctl.so \
     vendor/zuk/ham/proprietary/vendor/lib/libtime_genoff.so:system/vendor/lib/libtime_genoff.so \
     vendor/zuk/ham/proprietary/vendor/lib/libuiblur.so:system/vendor/lib/libuiblur.so \
-    vendor/zuk/ham/proprietary/vendor/lib/libwvdrm_L3.so:system/vendor/lib/libwvdrm_L3.so \
     vendor/zuk/ham/proprietary/vendor/lib/libxml.so:system/vendor/lib/libxml.so \
     vendor/zuk/ham/proprietary/vendor/lib/mediadrm/libwvdrmengine.so:system/vendor/lib/mediadrm/libwvdrmengine.so \
     vendor/zuk/ham/proprietary/vendor/lib/rfsa/adsp/libapps_mem_heap.so:system/vendor/lib/rfsa/adsp/libapps_mem_heap.so \
@@ -240,7 +234,6 @@ PRODUCT_COPY_FILES += \
     vendor/zuk/ham/proprietary/vendor/lib/soundfx/libqcvirt.so:system/vendor/lib/soundfx/libqcvirt.so
 
 PRODUCT_PACKAGES += \
-    libwpa_qmi_eap_proxy \
     TimeService \
     shutdownlistener \
     qcrilmsgtunnel
diff --git a/ham/proprietary/app/TimeService/TimeService.apk b/ham/proprietary/vendor/app/TimeService/TimeService.apk
index 59cdcc7..59cdcc7 100644
--- a/ham/proprietary/app/TimeService/TimeService.apk
+++ b/ham/proprietary/vendor/app/TimeService/TimeService.apk
diff --git a/ham/proprietary/app/shutdownlistener/shutdownlistener.apk b/ham/proprietary/vendor/app/shutdownlistener/shutdownlistener.apk
index dd4a105..dd4a105 100644
--- a/ham/proprietary/app/shutdownlistener/shutdownlistener.apk
+++ b/ham/proprietary/vendor/app/shutdownlistener/shutdownlistener.apk
diff --git a/ham/proprietary/bin/adsprpcd b/ham/proprietary/vendor/bin/adsprpcd
index d229178..d229178 100755
--- a/ham/proprietary/bin/adsprpcd
+++ b/ham/proprietary/vendor/bin/adsprpcd
diff --git a/ham/proprietary/bin/btnvtool b/ham/proprietary/vendor/bin/btnvtool
index 6578a2e..6578a2e 100755
--- a/ham/proprietary/bin/btnvtool
+++ b/ham/proprietary/vendor/bin/btnvtool
diff --git a/ham/proprietary/bin/diag_mdlog b/ham/proprietary/vendor/bin/diag_mdlog
index e989804..e989804 100755
--- a/ham/proprietary/bin/diag_mdlog
+++ b/ham/proprietary/vendor/bin/diag_mdlog
diff --git a/ham/proprietary/bin/hci_qcomm_init b/ham/proprietary/vendor/bin/hci_qcomm_init
index 224b345..224b345 100755
--- a/ham/proprietary/bin/hci_qcomm_init
+++ b/ham/proprietary/vendor/bin/hci_qcomm_init
diff --git a/ham/proprietary/bin/irsc_util b/ham/proprietary/vendor/bin/irsc_util
index 8c881e8..8c881e8 100755
--- a/ham/proprietary/bin/irsc_util
+++ b/ham/proprietary/vendor/bin/irsc_util
diff --git a/ham/proprietary/vendor/bin/loc_launcher b/ham/proprietary/vendor/bin/loc_launcher
new file mode 100644
index 0000000..cfe67f5
--- /dev/null
+++ b/ham/proprietary/vendor/bin/loc_launcher
diff --git a/ham/proprietary/bin/mm-qcamera-daemon b/ham/proprietary/vendor/bin/mm-qcamera-daemon
index dfbf3b2..dfbf3b2 100755
--- a/ham/proprietary/bin/mm-qcamera-daemon
+++ b/ham/proprietary/vendor/bin/mm-qcamera-daemon
diff --git a/ham/proprietary/bin/mpdecision b/ham/proprietary/vendor/bin/mpdecision
index 4b0f984..4b0f984 100755
--- a/ham/proprietary/bin/mpdecision
+++ b/ham/proprietary/vendor/bin/mpdecision
diff --git a/ham/proprietary/bin/netmgrd b/ham/proprietary/vendor/bin/netmgrd
index 69ae76f..2e04469 100755
--- a/ham/proprietary/bin/netmgrd
+++ b/ham/proprietary/vendor/bin/netmgrd
diff --git a/ham/proprietary/bin/qmuxd b/ham/proprietary/vendor/bin/qmuxd
index 5241dc2..5241dc2 100755
--- a/ham/proprietary/bin/qmuxd
+++ b/ham/proprietary/vendor/bin/qmuxd
diff --git a/ham/proprietary/bin/qseecomd b/ham/proprietary/vendor/bin/qseecomd
index 3d809a7..3d809a7 100755
--- a/ham/proprietary/bin/qseecomd
+++ b/ham/proprietary/vendor/bin/qseecomd
diff --git a/ham/proprietary/bin/radish b/ham/proprietary/vendor/bin/radish
index fc01dca..fc01dca 100755
--- a/ham/proprietary/bin/radish
+++ b/ham/proprietary/vendor/bin/radish
diff --git a/ham/proprietary/bin/rfs_access b/ham/proprietary/vendor/bin/rfs_access
index 5b3c499..5b3c499 100755
--- a/ham/proprietary/bin/rfs_access
+++ b/ham/proprietary/vendor/bin/rfs_access
diff --git a/ham/proprietary/bin/rmt_storage b/ham/proprietary/vendor/bin/rmt_storage
index 1d6746f..1d6746f 100755
--- a/ham/proprietary/bin/rmt_storage
+++ b/ham/proprietary/vendor/bin/rmt_storage
diff --git a/ham/proprietary/bin/sensors.qcom b/ham/proprietary/vendor/bin/sensors.qcom
index 314ede3..314ede3 100755
--- a/ham/proprietary/bin/sensors.qcom
+++ b/ham/proprietary/vendor/bin/sensors.qcom
diff --git a/ham/proprietary/bin/time_daemon b/ham/proprietary/vendor/bin/time_daemon
index 2661bcb..2661bcb 100755
--- a/ham/proprietary/bin/time_daemon
+++ b/ham/proprietary/vendor/bin/time_daemon
diff --git a/ham/proprietary/etc/data/dsi_config.xml b/ham/proprietary/vendor/etc/data/dsi_config.xml
index c09ebe9..c09ebe9 100644
--- a/ham/proprietary/etc/data/dsi_config.xml
+++ b/ham/proprietary/vendor/etc/data/dsi_config.xml
diff --git a/ham/proprietary/etc/data/netmgr_config.xml b/ham/proprietary/vendor/etc/data/netmgr_config.xml
index c6f2616..c6f2616 100644
--- a/ham/proprietary/etc/data/netmgr_config.xml
+++ b/ham/proprietary/vendor/etc/data/netmgr_config.xml
diff --git a/ham/proprietary/etc/permissions/qcnvitems.xml b/ham/proprietary/vendor/etc/permissions/qcnvitems.xml
index a29c64a..a29c64a 100644
--- a/ham/proprietary/etc/permissions/qcnvitems.xml
+++ b/ham/proprietary/vendor/etc/permissions/qcnvitems.xml
diff --git a/ham/proprietary/etc/permissions/qcrilhook.xml b/ham/proprietary/vendor/etc/permissions/qcrilhook.xml
index 6ca9c57..6ca9c57 100644
--- a/ham/proprietary/etc/permissions/qcrilhook.xml
+++ b/ham/proprietary/vendor/etc/permissions/qcrilhook.xml
diff --git a/ham/proprietary/etc/firmware/a330_pfp.fw b/ham/proprietary/vendor/firmware/a330_pfp.fw
index 622f6c0..622f6c0 100644
--- a/ham/proprietary/etc/firmware/a330_pfp.fw
+++ b/ham/proprietary/vendor/firmware/a330_pfp.fw
diff --git a/ham/proprietary/etc/firmware/a330_pm4.fw b/ham/proprietary/vendor/firmware/a330_pm4.fw
index 433dd04..433dd04 100644
--- a/ham/proprietary/etc/firmware/a330_pm4.fw
+++ b/ham/proprietary/vendor/firmware/a330_pm4.fw
diff --git a/ham/proprietary/etc/firmware/cpp_firmware_v1_1_1.fw b/ham/proprietary/vendor/firmware/cpp_firmware_v1_1_1.fw
index 537f8bc..537f8bc 100644
--- a/ham/proprietary/etc/firmware/cpp_firmware_v1_1_1.fw
+++ b/ham/proprietary/vendor/firmware/cpp_firmware_v1_1_1.fw
diff --git a/ham/proprietary/etc/firmware/cpp_firmware_v1_1_6.fw b/ham/proprietary/vendor/firmware/cpp_firmware_v1_1_6.fw
index e9a3703..e9a3703 100644
--- a/ham/proprietary/etc/firmware/cpp_firmware_v1_1_6.fw
+++ b/ham/proprietary/vendor/firmware/cpp_firmware_v1_1_6.fw
diff --git a/ham/proprietary/etc/firmware/cpp_firmware_v1_2_0.fw b/ham/proprietary/vendor/firmware/cpp_firmware_v1_2_0.fw
index 0aed50d..0aed50d 100644
--- a/ham/proprietary/etc/firmware/cpp_firmware_v1_2_0.fw
+++ b/ham/proprietary/vendor/firmware/cpp_firmware_v1_2_0.fw
diff --git a/ham/proprietary/etc/firmware/venus.b00 b/ham/proprietary/vendor/firmware/venus.b00
index c22e783..c22e783 100644
--- a/ham/proprietary/etc/firmware/venus.b00
+++ b/ham/proprietary/vendor/firmware/venus.b00
diff --git a/ham/proprietary/etc/firmware/venus.b01 b/ham/proprietary/vendor/firmware/venus.b01
index aafbf4f..aafbf4f 100644
--- a/ham/proprietary/etc/firmware/venus.b01
+++ b/ham/proprietary/vendor/firmware/venus.b01
diff --git a/ham/proprietary/etc/firmware/venus.b02 b/ham/proprietary/vendor/firmware/venus.b02
index 4e8bee2..4e8bee2 100644
--- a/ham/proprietary/etc/firmware/venus.b02
+++ b/ham/proprietary/vendor/firmware/venus.b02
diff --git a/ham/proprietary/etc/firmware/venus.b03 b/ham/proprietary/vendor/firmware/venus.b03
index 518df32..518df32 100644
--- a/ham/proprietary/etc/firmware/venus.b03
+++ b/ham/proprietary/vendor/firmware/venus.b03
diff --git a/ham/proprietary/etc/firmware/venus.b04 b/ham/proprietary/vendor/firmware/venus.b04
index 90c7fc9..90c7fc9 100644
--- a/ham/proprietary/etc/firmware/venus.b04
+++ b/ham/proprietary/vendor/firmware/venus.b04
diff --git a/ham/proprietary/etc/firmware/venus.mbn b/ham/proprietary/vendor/firmware/venus.mbn
index deff6f8..deff6f8 100644
--- a/ham/proprietary/etc/firmware/venus.mbn
+++ b/ham/proprietary/vendor/firmware/venus.mbn
diff --git a/ham/proprietary/etc/firmware/venus.mdt b/ham/proprietary/vendor/firmware/venus.mdt
index c3ede24..c3ede24 100644
--- a/ham/proprietary/etc/firmware/venus.mdt
+++ b/ham/proprietary/vendor/firmware/venus.mdt
diff --git a/ham/proprietary/framework/ConnectivityExt.jar b/ham/proprietary/vendor/framework/ConnectivityExt.jar
index e6a46f7..e6a46f7 100644
--- a/ham/proprietary/framework/ConnectivityExt.jar
+++ b/ham/proprietary/vendor/framework/ConnectivityExt.jar
diff --git a/ham/proprietary/framework/qcnvitems.jar b/ham/proprietary/vendor/framework/qcnvitems.jar
index f6324cf..f6324cf 100644
--- a/ham/proprietary/framework/qcnvitems.jar
+++ b/ham/proprietary/vendor/framework/qcnvitems.jar
diff --git a/ham/proprietary/framework/qcrilhook.jar b/ham/proprietary/vendor/framework/qcrilhook.jar
index 28e4245..28e4245 100644
--- a/ham/proprietary/framework/qcrilhook.jar
+++ b/ham/proprietary/vendor/framework/qcrilhook.jar
diff --git a/ham/proprietary/lib/hw/fingerprint.msm8974.so b/ham/proprietary/vendor/lib/hw/fingerprint.msm8974.so
index 4a12427..4a12427 100644
--- a/ham/proprietary/lib/hw/fingerprint.msm8974.so
+++ b/ham/proprietary/vendor/lib/hw/fingerprint.msm8974.so
diff --git a/ham/proprietary/lib/lib_fpc_tac_shared.so b/ham/proprietary/vendor/lib/lib_fpc_tac_shared.so
index 8655311..8655311 100644
--- a/ham/proprietary/lib/lib_fpc_tac_shared.so
+++ b/ham/proprietary/vendor/lib/lib_fpc_tac_shared.so
diff --git a/ham/proprietary/lib/libdrmdecrypt.so b/ham/proprietary/vendor/lib/libdrmdecrypt.so
index 674ba89..674ba89 100644
--- a/ham/proprietary/lib/libdrmdecrypt.so
+++ b/ham/proprietary/vendor/lib/libdrmdecrypt.so
diff --git a/ham/proprietary/vendor/lib/libdsi_netctrl.so b/ham/proprietary/vendor/lib/libdsi_netctrl.so
index 161d0ea..5cc686a 100644
--- a/ham/proprietary/vendor/lib/libdsi_netctrl.so
+++ b/ham/proprietary/vendor/lib/libdsi_netctrl.so
diff --git a/ham/proprietary/lib/libloc_api_v02.so b/ham/proprietary/vendor/lib/libloc_api_v02.so
index c9db43d..c9db43d 100644
--- a/ham/proprietary/lib/libloc_api_v02.so
+++ b/ham/proprietary/vendor/lib/libloc_api_v02.so
diff --git a/ham/proprietary/lib/libloc_ds_api.so b/ham/proprietary/vendor/lib/libloc_ds_api.so
index b57f040..b57f040 100644
--- a/ham/proprietary/lib/libloc_ds_api.so
+++ b/ham/proprietary/vendor/lib/libloc_ds_api.so
diff --git a/ham/proprietary/lib/libmdmdetect.so b/ham/proprietary/vendor/lib/libmdmdetect.so
index e53c042..e53c042 100644
--- a/ham/proprietary/lib/libmdmdetect.so
+++ b/ham/proprietary/vendor/lib/libmdmdetect.so
diff --git a/ham/proprietary/lib/libmmcamera_interface.so b/ham/proprietary/vendor/lib/libmmcamera_interface.so
index 453cc79..453cc79 100644
--- a/ham/proprietary/lib/libmmcamera_interface.so
+++ b/ham/proprietary/vendor/lib/libmmcamera_interface.so
diff --git a/ham/proprietary/lib/libmmjpeg_interface.so b/ham/proprietary/vendor/lib/libmmjpeg_interface.so
index 94d537a..94d537a 100644
--- a/ham/proprietary/lib/libmmjpeg_interface.so
+++ b/ham/proprietary/vendor/lib/libmmjpeg_interface.so
diff --git a/ham/proprietary/lib/libqomx_core.so b/ham/proprietary/vendor/lib/libqomx_core.so
index 5eca3fe..5eca3fe 100644
--- a/ham/proprietary/lib/libqomx_core.so
+++ b/ham/proprietary/vendor/lib/libqomx_core.so
diff --git a/ham/proprietary/lib/libwcnss_qmi.so b/ham/proprietary/vendor/lib/libwcnss_qmi.so
index b61e448..b61e448 100644
--- a/ham/proprietary/lib/libwcnss_qmi.so
+++ b/ham/proprietary/vendor/lib/libwcnss_qmi.so
diff --git a/ham/proprietary/lib/libwpa_qmi_eap_proxy.so b/ham/proprietary/vendor/lib/libwpa_qmi_eap_proxy.so
index fbb3d47..fbb3d47 100644
--- a/ham/proprietary/lib/libwpa_qmi_eap_proxy.so
+++ b/ham/proprietary/vendor/lib/libwpa_qmi_eap_proxy.so
diff --git a/ham/proprietary/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk b/ham/proprietary/vendor/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
index 39d36ac..39d36ac 100644
--- a/ham/proprietary/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
+++ b/ham/proprietary/vendor/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk