From 91b75564fe42956e6c4f96e5ece6e0dd14670648 Mon Sep 17 00:00:00 2001
From: Ethan Chen <intervigil@gmail.com>
Date: Wed, 2 Mar 2016 17:01:16 -0800
Subject: [PATCH] crackling: Remove QC location stack

* Don't use QC location APK, there are still issues with the fused
  provider.

REF: CYNGNOS-1514
Change-Id: I0896439ebdcb44e2706e206319da1a524fb78f51
---
 proprietary-files-qc.txt | 18 ------------------
 setup-makefiles.sh       | 14 --------------
 2 files changed, 32 deletions(-)

diff --git a/proprietary-files-qc.txt b/proprietary-files-qc.txt
index 23136bc..1a8880a 100644
--- a/proprietary-files-qc.txt
+++ b/proprietary-files-qc.txt
@@ -121,38 +121,20 @@ vendor/lib/drm/libdrmwvmplugin.so
 vendor/lib/mediadrm/libwvdrmengine.so
 
 # GPS
-etc/permissions/com.qualcomm.location.xml
 -lib64/libloc_api_v02.so
 -lib64/libloc_ds_api.so
 -lib/libloc_api_v02.so
 -lib/libloc_ds_api.so
--priv-app/com.qualcomm.location/com.qualcomm.location.apk
 vendor/lib64/hw/flp.default.so
-vendor/lib64/libdataitems.so
 vendor/lib64/libflp.so
 vendor/lib64/libgeofence.so
 vendor/lib64/libizat_core.so
 vendor/lib64/liblbs_core.so
-vendor/lib64/liblocationservice.so
-vendor/lib64/liblocationservice_glue.so
-vendor/lib64/liblowi_client.so
-vendor/lib64/libquipc_os_api.so
-vendor/lib64/libulp2.so
-vendor/lib64/libxtadapter.so
-vendor/lib64/libxtwifi_ulp_adaptor.so
 vendor/lib/hw/flp.default.so
-vendor/lib/libdataitems.so
 vendor/lib/libflp.so
 vendor/lib/libgeofence.so
 vendor/lib/libizat_core.so
 vendor/lib/liblbs_core.so
-vendor/lib/liblocationservice.so
-vendor/lib/liblocationservice_glue.so
-vendor/lib/liblowi_client.so
-vendor/lib/libquipc_os_api.so
-vendor/lib/libulp2.so
-vendor/lib/libxtadapter.so
-vendor/lib/libxtwifi_ulp_adaptor.so
 
 # Graphics
 vendor/lib64/egl/eglsubAndroid.so
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index f52b5cf..5e5f094 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -94,9 +94,6 @@ EOF
 # This file is generated by device/$VENDOR/$DEVICE/setup-makefiles.sh
 
 # Pick up overlay for features that depend on non-open-source files
-PRODUCT_PACKAGES += \\
-    com.qualcomm.location
-
 PRODUCT_PACKAGES += \\
     qcrilmsgtunnel \\
     shutdownlistener \\
@@ -173,17 +170,6 @@ LOCAL_PATH := \$(call my-dir)
 ifeq (\$(TARGET_DEVICE),crackling)
 ifeq (\$(QCPATH),)
 
-include \$(CLEAR_VARS)
-LOCAL_MODULE := com.qualcomm.location
-LOCAL_MODULE_OWNER := $VENDOR
-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_PRIVILEGED_MODULE := true
-LOCAL_CERTIFICATE := platform
-include \$(BUILD_PREBUILT)
-
 include \$(CLEAR_VARS)
 LOCAL_MODULE := qcrilmsgtunnel
 LOCAL_MODULE_OWNER := $VENDOR