From 982a025f5a0be8193e1152763dc0198f42579a3c Mon Sep 17 00:00:00 2001
From: Steve Kondik <steve@cyngn.com>
Date: Mon, 17 Nov 2014 22:17:54 -0800
Subject: [PATCH] msm8974: Update blob list

 * NON FINAL

Change-Id: I3f26c0eea888766d59b946d6df42823ff5518eb2
---

diff --git a/proprietary-files-qc.txt b/proprietary-files-qc.txt
index d9197f0..5292fad 100644
--- a/proprietary-files-qc.txt
+++ b/proprietary-files-qc.txt
@@ -2,7 +2,6 @@
 bin/btnvtool
 bin/hci_qcomm_init
 vendor/lib/libbtnv.so
-vendor/lib/liboi_sbc_decoder.so
 
 # Perf
 bin/mpdecision
@@ -43,20 +42,20 @@
 # DRM
 bin/qseecomd
 lib/libQSEEComAPI.so:vendor/lib/libQSEEComAPI.so
-lib/libdrmdecrypt.so
+#lib/libdrmdecrypt.so
 vendor/lib/libdrmdiag.so
 vendor/lib/libdrmfs.so
 vendor/lib/libdrmtime.so
 vendor/lib/librpmb.so
 vendor/lib/libssd.so
-vendor/lib/libwvdrm_L3.so
-vendor/lib/libwvm.so
-vendor/lib/libWVStreamControlAPI_L3.so
-vendor/lib/drm/libdrmwvmplugin.so
-vendor/lib/mediadrm/libwvdrmengine.so
+#vendor/lib/libwvdrm_L3.so
+#vendor/lib/libwvm.so
+#vendor/lib/libWVStreamControlAPI_L3.so
+#vendor/lib/drm/libdrmwvmplugin.so
+#vendor/lib/mediadrm/libwvdrmengine.so
 
 # GPS
--priv-app/com.qualcomm.location.apk
+-priv-app/com.qualcomm.location/com.qualcomm.location.apk
 bin/gsiff_daemon
 bin/quipc_igsn
 bin/quipc_main
@@ -139,8 +138,8 @@
 vendor/lib/libqmiservices.so
 
 # Radio
--app/qcrilmsgtunnel.apk
--app/shutdownlistener.apk
+-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
+-app/shutdownlistener/shutdownlistener.apk
 bin/netmgrd
 bin/qmuxd
 bin/radish
@@ -169,17 +168,17 @@
 bin/time_daemon
 -vendor/lib/libtime_genoff.so
 -vendor/lib/libTimeService.so
--app/TimeService.apk
+-app/TimeService/TimeService.apk
 
 # Listen service
-vendor/lib/liblistenhardware.so
-vendor/lib/liblistenjni.so
--vendor/lib/liblisten.so
-vendor/lib/liblistensoundmodel.so
-vendor/lib/liblistensoundmodel2.so
+#vendor/lib/liblistenhardware.so
+#vendor/lib/liblistenjni.so
+#-vendor/lib/liblisten.so
+#vendor/lib/liblistensoundmodel.so
+#vendor/lib/liblistensoundmodel2.so
 
 # QuickBoot
--app/QuickBoot.apk
+-app/QuickBoot/QuickBoot.apk
 
 # Fastcharge
 bin/hvdcp
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index ed97cb8..af95713 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -249,7 +249,7 @@
 include \$(CLEAR_VARS)
 LOCAL_MODULE := com.qualcomm.location
 LOCAL_MODULE_OWNER := $VENDOR
-LOCAL_SRC_FILES := proprietary/priv-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
@@ -260,7 +260,7 @@
 include \$(CLEAR_VARS)
 LOCAL_MODULE := qcrilmsgtunnel
 LOCAL_MODULE_OWNER := $VENDOR
-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
@@ -270,7 +270,7 @@
 include \$(CLEAR_VARS)
 LOCAL_MODULE := QuickBoot
 LOCAL_MODULE_OWNER := $VENDOR
-LOCAL_SRC_FILES := proprietary/app/QuickBoot.apk
+LOCAL_SRC_FILES := proprietary/app/QuickBoot/QuickBoot.apk
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_SUFFIX := \$(COMMON_ANDROID_PACKAGE_SUFFIX)
 LOCAL_MODULE_CLASS := APPS
@@ -280,7 +280,7 @@
 include \$(CLEAR_VARS)
 LOCAL_MODULE := shutdownlistener
 LOCAL_MODULE_OWNER := $VENDOR
-LOCAL_SRC_FILES := proprietary/app/shutdownlistener.apk
+LOCAL_SRC_FILES := proprietary/app/shutdownlistener/shutdownlistener.apk
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_SUFFIX := \$(COMMON_ANDROID_PACKAGE_SUFFIX)
 LOCAL_MODULE_CLASS := APPS
@@ -340,7 +340,7 @@
 include \$(CLEAR_VARS)
 LOCAL_MODULE := TimeService
 LOCAL_MODULE_OWNER := $VENDOR
-LOCAL_SRC_FILES := proprietary/app/TimeService.apk
+LOCAL_SRC_FILES := proprietary/app/TimeService/TimeService.apk
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_SUFFIX := \$(COMMON_ANDROID_PACKAGE_SUFFIX)
 LOCAL_MODULE_CLASS := APPS