Carbonite12 · judas77 · Dec 15, 2014 · Mar 24, 2015
diff --git a/w7/Android.mk b/w7/Android.mk
@@ -21,27 +21,18 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE := com.qualcomm.location
 LOCAL_MODULE_OWNER := lge
-LOCAL_SRC_FILES := proprietary/app/com.qualcomm.location.apk
+LOCAL_SRC_FILES := proprietary/priv-app/com.qualcomm.location/com.qualcomm.location.apk
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 LOCAL_MODULE_CLASS := APPS
 LOCAL_CERTIFICATE := platform
+LOCAL_PRIVILEGED_MODULE := true
 include $(BUILD_PREBUILT)
 
-#include $(CLEAR_VARS)
-#LOCAL_MODULE := com.qualcomm.services.location
-#LOCAL_MODULE_OWNER := lge
-#LOCAL_SRC_FILES := proprietary/app/com.qualcomm.services.location.apk
-#LOCAL_MODULE_TAGS := optional
-#LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-#LOCAL_MODULE_CLASS := APPS
-#LOCAL_CERTIFICATE := platform
-#include $(BUILD_PREBUILT)
-
 include $(CLEAR_VARS)
-LOCAL_MODULE := TimeService
+LOCAL_MODULE := shutdownlistener
 LOCAL_MODULE_OWNER := lge
-LOCAL_SRC_FILES := proprietary/app/TimeService.apk
+LOCAL_SRC_FILES := proprietary/app/shutdownlistener/shutdownlistener.apk
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 LOCAL_MODULE_CLASS := APPS
@@ -51,12 +42,52 @@ include $(BUILD_PREBUILT)
 include $(CLEAR_VARS)
 LOCAL_MODULE := qcrilmsgtunnel
 LOCAL_MODULE_OWNER := lge
-LOCAL_SRC_FILES := proprietary/app/qcrilmsgtunnel.apk
+LOCAL_SRC_FILES := proprietary/app/qcrilmsgtunnel/qcrilmsgtunnel.apk
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 LOCAL_MODULE_CLASS := APPS
 LOCAL_CERTIFICATE := platform
 include $(BUILD_PREBUILT)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := QuickBoot
+LOCAL_MODULE_OWNER := lge
+LOCAL_SRC_FILES := proprietary/app/QuickBoot/QuickBoot.apk
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+LOCAL_MODULE_CLASS := APPS
+LOCAL_CERTIFICATE := platform
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libtime_genoff
+LOCAL_MODULE_OWNER := lge
+LOCAL_SRC_FILES := proprietary/vendor/lib/libtime_genoff.so
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := TimeService
+LOCAL_MODULE_OWNER := lge
+LOCAL_SRC_FILES := proprietary/app/TimeService/TimeService.apk
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+LOCAL_MODULE_CLASS := APPS
+LOCAL_CERTIFICATE := platform
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libTimeService
+LOCAL_MODULE_OWNER := lge
+LOCAL_SRC_FILES := proprietary/vendor/lib/libTimeService.so
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+include $(BUILD_PREBUILT)
+
 endif
 
diff --git a/w7/proprietary/app/QuickBoot/QuickBoot.apk b/w7/proprietary/app/QuickBoot/QuickBoot.apk
diff --git a/w7/proprietary/app/TimeService.apk b/w7/proprietary/app/TimeService.apk
diff --git a/w7/proprietary/app/TimeService/TimeService.apk b/w7/proprietary/app/TimeService/TimeService.apk
diff --git a/w7/proprietary/app/com.qualcomm.location.apk b/w7/proprietary/app/com.qualcomm.location.apk
diff --git a/w7/proprietary/app/qcrilmsgtunnel.apk b/w7/proprietary/app/qcrilmsgtunnel.apk
diff --git a/w7/proprietary/app/qcrilmsgtunnel/qcrilmsgtunnel.apk b/w7/proprietary/app/qcrilmsgtunnel/qcrilmsgtunnel.apk
diff --git a/w7/proprietary/app/shutdownlistener/shutdownlistener.apk b/w7/proprietary/app/shutdownlistener/shutdownlistener.apk
diff --git a/w7/proprietary/bin/bdaddr_loader b/w7/proprietary/bin/bdaddr_loader
diff --git a/w7/proprietary/bin/btnvtool b/w7/proprietary/bin/btnvtool
diff --git a/w7/proprietary/bin/hci_qcomm_init b/w7/proprietary/bin/hci_qcomm_init
diff --git a/w7/proprietary/bin/mpdecision b/w7/proprietary/bin/mpdecision
diff --git a/w7/proprietary/bin/netmgrd b/w7/proprietary/bin/netmgrd
diff --git a/w7/proprietary/bin/qmuxd b/w7/proprietary/bin/qmuxd
diff --git a/w7/proprietary/bin/rild b/w7/proprietary/bin/rild
diff --git a/w7/proprietary/etc/permissions/com.qualcomm.location.xml b/w7/proprietary/etc/permissions/com.qualcomm.location.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!---******************************************************************************
+* @file    com.qualcomm.location.xml
+* @brief   configuration file for permission mapping
+*  Copyright (c) 2012 Qualcomm Atheros, Inc.
+*  All Rights Reserved.
+*  Qualcomm Atheros Confidential and Proprietary.
+*  *****************************************************************************-->
+
+
+<permissions>
+
+<permission name="com.qualcomm.permission.IZAT" >
+    <group gid="gps" />
+    <group gid="net_raw" />
+    <group gid="net_admin" />
+    <group gid="system" />
+    <group gid="qcom_diag" />
+    <group gid="sdcard_rw" />
+    <group gid="media_rw" />
+    <group gid="wifi" />
+</permission>
+
+</permissions>
+
diff --git a/w7/proprietary/etc/permissions/qcnvitems.xml b/w7/proprietary/etc/permissions/qcnvitems.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<permissions>
+ <library name="com.qualcomm.qcnvitems"
+          file="/system/framework/qcnvitems.jar"/>
+</permissions>
diff --git a/w7/proprietary/etc/permissions/qcrilhook.xml b/w7/proprietary/etc/permissions/qcrilhook.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<permissions>
+ <library name="com.qualcomm.qcrilhook"
+          file="/system/framework/qcrilhook.jar"/>
+</permissions>
diff --git a/w7/proprietary/lib/libatd_corelib.so b/w7/proprietary/lib/libatd_corelib.so
diff --git a/w7/proprietary/lib/libbtnv.so b/w7/proprietary/lib/libbtnv.so
diff --git a/w7/proprietary/lib/libcnefeatureconfig.so b/w7/proprietary/lib/libcnefeatureconfig.so
diff --git a/w7/proprietary/lib/liblgftmitem.so b/w7/proprietary/lib/liblgftmitem.so
diff --git a/w7/proprietary/lib/libloc_api_v02.so b/w7/proprietary/lib/libloc_api_v02.so
diff --git a/w7/proprietary/lib/libloc_core.so b/w7/proprietary/lib/libloc_core.so
diff --git a/w7/proprietary/lib/libloc_ds_api.so b/w7/proprietary/lib/libloc_ds_api.so
diff --git a/w7/proprietary/lib/libloc_eng.so b/w7/proprietary/lib/libloc_eng.so
diff --git a/w7/proprietary/lib/libmdmdetect.so b/w7/proprietary/lib/libmdmdetect.so
diff --git a/w7/proprietary/lib/libril.so b/w7/proprietary/lib/libril.so
diff --git a/w7/proprietary/lib/libuicc.so b/w7/proprietary/lib/libuicc.so
diff --git a/w7/proprietary/priv-app/com.qualcomm.location/com.qualcomm.location.apk b/w7/proprietary/priv-app/com.qualcomm.location/com.qualcomm.location.apk
diff --git a/w7/proprietary/vendor/lib/egl/eglsubAndroid.so b/w7/proprietary/vendor/lib/egl/eglsubAndroid.so
diff --git a/w7/proprietary/vendor/lib/egl/libEGL_adreno.so b/w7/proprietary/vendor/lib/egl/libEGL_adreno.so
diff --git a/w7/proprietary/vendor/lib/egl/libGLESv1_CM_adreno.so b/w7/proprietary/vendor/lib/egl/libGLESv1_CM_adreno.so
diff --git a/w7/proprietary/vendor/lib/egl/libGLESv2_adreno.so b/w7/proprietary/vendor/lib/egl/libGLESv2_adreno.so
diff --git a/w7/proprietary/vendor/lib/egl/libq3dtools_adreno.so b/w7/proprietary/vendor/lib/egl/libq3dtools_adreno.so
diff --git a/w7/proprietary/vendor/lib/libC2D2.so b/w7/proprietary/vendor/lib/libC2D2.so
diff --git a/w7/proprietary/vendor/lib/libCB.so b/w7/proprietary/vendor/lib/libCB.so
diff --git a/w7/proprietary/vendor/lib/libOpenVG.so b/w7/proprietary/vendor/lib/libOpenVG.so
diff --git a/w7/proprietary/vendor/lib/libRSDriver_adreno.so b/w7/proprietary/vendor/lib/libRSDriver_adreno.so
diff --git a/w7/proprietary/vendor/lib/libadreno_utils.so b/w7/proprietary/vendor/lib/libadreno_utils.so
diff --git a/w7/proprietary/vendor/lib/libalarmservice_jni.so b/w7/proprietary/vendor/lib/libalarmservice_jni.so
diff --git a/w7/proprietary/vendor/lib/libbccQTI.so b/w7/proprietary/vendor/lib/libbccQTI.so
diff --git a/w7/proprietary/vendor/lib/libc2d30-a3xx.so b/w7/proprietary/vendor/lib/libc2d30-a3xx.so
diff --git a/w7/proprietary/vendor/lib/libc2d30.so b/w7/proprietary/vendor/lib/libc2d30.so
diff --git a/w7/proprietary/vendor/lib/libcneapiclient.so b/w7/proprietary/vendor/lib/libcneapiclient.so
diff --git a/w7/proprietary/vendor/lib/libconfigdb.so b/w7/proprietary/vendor/lib/libconfigdb.so
diff --git a/w7/proprietary/vendor/lib/libdiag.so b/w7/proprietary/vendor/lib/libdiag.so
diff --git a/w7/proprietary/vendor/lib/libdsi_netctrl.so b/w7/proprietary/vendor/lib/libdsi_netctrl.so
diff --git a/w7/proprietary/vendor/lib/libdsucsd.so b/w7/proprietary/vendor/lib/libdsucsd.so
diff --git a/w7/proprietary/vendor/lib/libdsutils.so b/w7/proprietary/vendor/lib/libdsutils.so
diff --git a/w7/proprietary/vendor/lib/libgeofence.so b/w7/proprietary/vendor/lib/libgeofence.so
diff --git a/w7/proprietary/vendor/lib/libgsl.so b/w7/proprietary/vendor/lib/libgsl.so
diff --git a/w7/proprietary/vendor/lib/libidl.so b/w7/proprietary/vendor/lib/libidl.so
diff --git a/w7/proprietary/vendor/lib/libizat_core.so b/w7/proprietary/vendor/lib/libizat_core.so
diff --git a/w7/proprietary/vendor/lib/liblbs_core.so b/w7/proprietary/vendor/lib/liblbs_core.so
diff --git a/w7/proprietary/vendor/lib/libllvm-qcom.so b/w7/proprietary/vendor/lib/libllvm-qcom.so
diff --git a/w7/proprietary/vendor/lib/liblocationservice.so b/w7/proprietary/vendor/lib/liblocationservice.so
diff --git a/w7/proprietary/vendor/lib/liblowi_client.so b/w7/proprietary/vendor/lib/liblowi_client.so
diff --git a/w7/proprietary/vendor/lib/libnetmgr.so b/w7/proprietary/vendor/lib/libnetmgr.so
diff --git a/w7/proprietary/vendor/lib/libperipheral_client.so b/w7/proprietary/vendor/lib/libperipheral_client.so
diff --git a/w7/proprietary/vendor/lib/libqcci_legacy.so b/w7/proprietary/vendor/lib/libqcci_legacy.so
diff --git a/w7/proprietary/vendor/lib/libqdi.so b/w7/proprietary/vendor/lib/libqdi.so
diff --git a/w7/proprietary/vendor/lib/libqdp.so b/w7/proprietary/vendor/lib/libqdp.so
diff --git a/w7/proprietary/vendor/lib/libqmi.so b/w7/proprietary/vendor/lib/libqmi.so
diff --git a/w7/proprietary/vendor/lib/libqmi_cci.so b/w7/proprietary/vendor/lib/libqmi_cci.so
diff --git a/w7/proprietary/vendor/lib/libqmi_client_qmux.so b/w7/proprietary/vendor/lib/libqmi_client_qmux.so
diff --git a/w7/proprietary/vendor/lib/libqmi_common_so.so b/w7/proprietary/vendor/lib/libqmi_common_so.so
diff --git a/w7/proprietary/vendor/lib/libqmi_csi.so b/w7/proprietary/vendor/lib/libqmi_csi.so
diff --git a/w7/proprietary/vendor/lib/libqmi_csvt_srvc.so b/w7/proprietary/vendor/lib/libqmi_csvt_srvc.so
diff --git a/w7/proprietary/vendor/lib/libqmi_encdec.so b/w7/proprietary/vendor/lib/libqmi_encdec.so
diff --git a/w7/proprietary/vendor/lib/libqmiservices.so b/w7/proprietary/vendor/lib/libqmiservices.so
diff --git a/w7/proprietary/vendor/lib/libqti-perfd-client.so b/w7/proprietary/vendor/lib/libqti-perfd-client.so
diff --git a/w7/proprietary/vendor/lib/libquipc_os_api.so b/w7/proprietary/vendor/lib/libquipc_os_api.so
diff --git a/w7/proprietary/vendor/lib/libquipc_ulp_adapter.so b/w7/proprietary/vendor/lib/libquipc_ulp_adapter.so
diff --git a/w7/proprietary/vendor/lib/libril-qc-qmi-1.so b/w7/proprietary/vendor/lib/libril-qc-qmi-1.so
diff --git a/w7/proprietary/vendor/lib/libril-qcril-hook-oem.so b/w7/proprietary/vendor/lib/libril-qcril-hook-oem.so
diff --git a/w7/proprietary/vendor/lib/librs_adreno.so b/w7/proprietary/vendor/lib/librs_adreno.so
diff --git a/w7/proprietary/vendor/lib/librs_adreno_sha1.so b/w7/proprietary/vendor/lib/librs_adreno_sha1.so
diff --git a/w7/proprietary/vendor/lib/libsc-a3xx.so b/w7/proprietary/vendor/lib/libsc-a3xx.so
diff --git a/w7/proprietary/vendor/lib/libsmemlog.so b/w7/proprietary/vendor/lib/libsmemlog.so
diff --git a/w7/proprietary/vendor/lib/libsystem_health_mon.so b/w7/proprietary/vendor/lib/libsystem_health_mon.so
diff --git a/w7/proprietary/vendor/lib/libtime_genoff.so b/w7/proprietary/vendor/lib/libtime_genoff.so
diff --git a/w7/proprietary/vendor/lib/libulp2.so b/w7/proprietary/vendor/lib/libulp2.so
diff --git a/w7/proprietary/vendor/lib/libxml.so b/w7/proprietary/vendor/lib/libxml.so
diff --git a/w7/w7-vendor-blobs.mk b/w7/w7-vendor-blobs.mk
@@ -17,10 +17,7 @@ PRODUCT_COPY_FILES := \
 	    vendor/lge/w7/proprietary/vendor/lib/libtime_genoff.so:obj/lib/libtime_genoff.so
 
 PRODUCT_COPY_FILES += \
-    vendor/lge/w7/proprietary/app/TimeService.apk:system/app/TimeService.apk \
     vendor/lge/w7/proprietary/bin/time_daemon:system/bin/time_daemon \
-    vendor/lge/w7/proprietary/vendor/lib/libtime_genoff.so:system/vendor/lib/libtime_genoff.so \
-    vendor/lge/w7/proprietary/vendor/lib/libTimeService.so:system/vendor/lib/libTimeService.so \
     vendor/lge/w7/proprietary/vendor/firmware/keymaster/keymaster.b00:system/vendor/firmware/keymaster/keymaster.b00 \
     vendor/lge/w7/proprietary/vendor/firmware/keymaster/keymaster.b02:system/vendor/firmware/keymaster/keymaster.b02 \
     vendor/lge/w7/proprietary/vendor/firmware/keymaster/keymaster.mdt:system/vendor/firmware/keymaster/keymaster.mdt \
@@ -79,9 +76,18 @@ PRODUCT_COPY_FILES += \
     vendor/lge/w7/proprietary/vendor/lib/libqmi_common_so.so:system/vendor/lib/libqmi_common_so.so \
     vendor/lge/w7/proprietary/vendor/lib/libdsi_netctrl.so:system/vendor/lib/libdsi_netctrl.so \
     vendor/lge/w7/proprietary/vendor/lib/libqdi.so:system/vendor/lib/libqdi.so \
+    vendor/lge/w7/proprietary/vendor/lib/libqti-perfd-client.so:system/vendor/lib/libqti-perfd-client.so \
     vendor/lge/w7/proprietary/vendor/lib/libnetmgr.so:system/vendor/lib/libnetmgr.so \
     vendor/lge/w7/proprietary/vendor/lib/libdsnetutils.so:system/vendor/lib/libdsnetutils.so \
+    vendor/lge/w7/proprietary/vendor/lib/libsmemlog.so:system/vendor/lib/libsmemlog.so \
     vendor/lge/w7/proprietary/vendor/lib/libqdp.so:system/vendor/lib/libqdp.so \
+    vendor/lge/w7/proprietary/vendor/lib/libcneapiclient.so:system/vendor/lib/libcneapiclient.so \
+    vendor/lge/w7/proprietary/vendor/lib/libperipheral_client.so:system/vendor/lib/libperipheral_client.so \
+    vendor/lge/w7/proprietary/vendor/lib/libsystem_health_mon.so:system/vendor/lib/libsystem_health_mon.so \
+    vendor/lge/w7/proprietary/vendor/lib/libxml.so:system/vendor/lib/libxml.so \
+    vendor/lge/w7/proprietary/lib/libuicc.so:system/lib/libuicc.so \
+    vendor/lge/w7/proprietary/lib/libmdmdetect.so:system/lib/libmdmdetect.so \
+    vendor/lge/w7/proprietary/lib/libcnefeatureconfig.so:system/lib/libcnefeatureconfig.so \
     vendor/lge/w7/proprietary/lib/libvss_common_iface.so:system/lib/libvss_common_iface.so \
     vendor/lge/w7/proprietary/lib/libvss_common_idl.so:system/lib/libvss_common_idl.so \
     vendor/lge/w7/proprietary/lib/libvss_nv_iface.so:system/lib/libvss_nv_iface.so \
@@ -107,16 +113,21 @@ PRODUCT_COPY_FILES += \
     vendor/lge/w7/proprietary/vendor/lib/librs_adreno.so:system/vendor/lib/librs_adreno.so \
     vendor/lge/w7/proprietary/vendor/lib/libllvm-qcom.so:system/vendor/lib/libllvm-qcom.so \
     vendor/lge/w7/proprietary/vendor/lib/libgsl.so:system/vendor/lib/libgsl.so \
-    vendor/lge/w7/proprietary/vendor/lib/libc2d30.so:system/vendor/lib/libc2d30.so \
     vendor/lge/w7/proprietary/vendor/lib/libc2d30-a3xx.so:system/vendor/lib/libc2d30-a3xx.so \
     vendor/lge/w7/proprietary/vendor/lib/libadreno_utils.so:system/vendor/lib/libadreno_utils.so \
     vendor/lge/w7/proprietary/vendor/lib/libRSDriver_adreno.so:system/vendor/lib/libRSDriver_adreno.so \
-    vendor/lge/w7/proprietary/vendor/lib/libOpenVG.so:system/vendor/lib/libOpenVG.so \
     vendor/lge/w7/proprietary/vendor/lib/libOpenCL.so:system/vendor/lib/libOpenCL.so \
     vendor/lge/w7/proprietary/vendor/lib/libCB.so:system/vendor/lib/libCB.so \
     vendor/lge/w7/proprietary/vendor/lib/libC2D2.so:system/vendor/lib/libC2D2.so \
+    vendor/lge/w7/proprietary/vendor/lib/libbccQTI.so:system/vendor/lib/libbccQTI.so \
     vendor/lge/w7/proprietary/vendor/lib/libWVStreamControlAPI_L3.so:system/vendor/lib/libWVStreamControlAPI_L3.so \
     vendor/lge/w7/proprietary/vendor/lib/libwvm.so:system/vendor/lib/libwvm.so \
+    vendor/lge/w7/proprietary/bin/bdaddr_loader:system/bin/bdaddr_loader \
+    vendor/lge/w7/proprietary/bin/btnvtool:system/bin/btnvtool \
+    vendor/lge/w7/proprietary/bin/hci_qcomm_init:system/bin/hci_qcomm_init \
+    vendor/lge/w7/proprietary/lib/libatd_corelib.so:system/lib/libatd_corelib.so \
+    vendor/lge/w7/proprietary/lib/libbtnv.so:system/lib/libbtnv.so \
+    vendor/lge/w7/proprietary/lib/liblgftmitem.so:system/lib/liblgftmitem.so \
     vendor/lge/w7/proprietary/bin/mm-qcamera-daemon:system/bin/mm-qcamera-daemon \
     vendor/lge/w7/proprietary/lib/hw/camera.msm8226.so:system/lib/hw/camera.msm8226.so \
     vendor/lge/w7/proprietary/lib/libchromatix_hi543_common.so:system/lib/libchromatix_hi543_common.so \
@@ -203,24 +214,26 @@ PRODUCT_COPY_FILES += \
     vendor/lge/w7/proprietary/bin/thermal-engine:system/bin/thermal-engine \
     vendor/lge/w7/proprietary/vendor/lib/libthermalioctl.so:system/vendor/lib/libthermalioctl.so \
     vendor/lge/w7/proprietary/vendor/lib/libthermalclient.so:system/vendor/lib/libthermalclient.so \
-    vendor/lge/w7/proprietary/lib/hw/gps.default.so:system/lib/hw/gps.default.so \
-    vendor/lge/w7/proprietary/lib/libloc_core.so:system/lib/libloc_core.so \
-    vendor/lge/w7/proprietary/lib/libloc_eng.so:system/lib/libloc_eng.so \
+    vendor/lge/w7/proprietary/etc/permissions/com.qualcomm.location.xml:system/etc/permissions/com.qualcomm.location.xml \
     vendor/lge/w7/proprietary/lib/libloc_api_v02.so:system/lib/libloc_api_v02.so \
     vendor/lge/w7/proprietary/lib/libloc_ds_api.so:system/lib/libloc_ds_api.so \
-    vendor/lge/w7/proprietary/lib/libgps.utils.so:system/lib/libgps.utils.so \
-    vendor/lge/w7/proprietary/vendor/lib/libquipc_os_api.so:system/vendor/lib/libquipc_os_api.so \
-    vendor/lge/w7/proprietary/vendor/lib/liblocationservice.so:system/vendor/lib/liblocationservice.so \
-    vendor/lge/w7/proprietary/vendor/lib/libulp2.so:system/vendor/lib/libulp2.so \
     vendor/lge/w7/proprietary/vendor/lib/libgeofence.so:system/vendor/lib/libgeofence.so \
     vendor/lge/w7/proprietary/vendor/lib/libizat_core.so:system/vendor/lib/libizat_core.so \
     vendor/lge/w7/proprietary/vendor/lib/liblbs_core.so:system/vendor/lib/liblbs_core.so \
+    vendor/lge/w7/proprietary/vendor/lib/liblocationservice.so:system/vendor/lib/liblocationservice.so \
+    vendor/lge/w7/proprietary/vendor/lib/liblowi_client.so:system/vendor/lib/liblowi_client.so \
+    vendor/lge/w7/proprietary/vendor/lib/libquipc_os_api.so:system/vendor/lib/libquipc_os_api.so \
+    vendor/lge/w7/proprietary/vendor/lib/libquipc_os_api.so:system/vendor/lib/libquipc_os_api.so \
+    vendor/lge/w7/proprietary/vendor/lib/libquipc_ulp_adapter.so:system/vendor/lib/libquipc_ulp_adapter.so \
+    vendor/lge/w7/proprietary/vendor/lib/libulp2.so:system/vendor/lib/libulp2.so \
+    vendor/lge/w7/proprietary/vendor/lib/libalarmservice_jni.so:system/vendor/lib/libalarmservice_jni.so \
     vendor/lge/w7/proprietary/vendor/lib/hw/sensors.msm8226.so:system/vendor/lib/hw/sensors.msm8226.so \
     vendor/lge/w7/proprietary/vendor/lib/libsensor1.so:system/vendor/lib/libsensor1.so \
     vendor/lge/w7/proprietary/vendor/lib/libsensor_reg.so:system/vendor/lib/libsensor_reg.so \
     vendor/lge/w7/proprietary/bin/sensors.qcom:system/bin/sensors.qcom \
     vendor/lge/w7/proprietary/lib/hw/lights.msm8226.so:system/lib/hw/lights.msm8226.so \
     vendor/lge/w7/proprietary/vendor/lib/libbmc050.so:system/vendor/lib/libbmc050.so \
+    vendor/lge/w7/proprietary/bin/mpdecision:system/bin/mpdecision \
     vendor/lge/w7/proprietary/vendor/firmware/libpn547_fw.so:system/vendor/firmware/libpn547_fw.so \
     vendor/lge/w7/proprietary/vendor/lib/libQSEEComAPI.so:system/vendor/lib/libQSEEComAPI.so \
     vendor/lge/w7/proprietary/bin/mm-pp-daemon:system/bin/mm-pp-daemon \

diff --git a/w7/w7-vendor.mk b/w7/w7-vendor.mk
@@ -19,9 +19,24 @@ DEVICE_PACKAGE_OVERLAYS := vendor/lge/w7/overlay
 
 # Apps
 PRODUCT_PACKAGES += \
-    TimeService \
+    com.qualcomm.location \
+    QuickBoot \
     qcrilmsgtunnel \
-    com.qualcomm.location
+    shutdownlistener
+
+PRODUCT_PACKAGES += \
+    libtime_genoff \
+    libTimeService \
+    TimeService
+
+PRODUCT_PACKAGES += \
+    libscale \
+
+PRODUCT_PACKAGES += \
+    libwvdrmengine \
+    libwvdrm_L3 \
+    libwvm \
+    libWVStreamControlAPI_L3
 
 
 #com.qualcomm.services.location