From fc6741572f372d8bf71dc1f17f6633255467ae52 Mon Sep 17 00:00:00 2001
From: Steve Kondik <shade@chemlab.org>
Date: Sun, 24 Mar 2013 23:24:05 -0700
Subject: t0lte: use qcom gps hal

Change-Id: I3ba717015214a43a80a2ea1168c09f0fc6d89eb1
---
 BoardConfig.mk        |  1 +
 cm.dependencies       |  4 +++
 configs/gps.xml       | 71 ---------------------------------------------------
 proprietary-files.txt |  5 ----
 t0lte.mk              |  4 +--
 5 files changed, 7 insertions(+), 78 deletions(-)
 delete mode 100644 configs/gps.xml

diff --git a/BoardConfig.mk b/BoardConfig.mk
index fee025c..ed99f0b 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -18,6 +18,7 @@
 # by BoardConfigVendor.mk
 
 -include device/samsung/smdk4412-common/BoardCommonConfig.mk
+-include device/samsung/smdk4412-qcom-common/BoardCommonConfig.mk
 
 LOCAL_PATH := device/samsung/t0lte
 
diff --git a/cm.dependencies b/cm.dependencies
index a1ab9d7..2f9b3f6 100644
--- a/cm.dependencies
+++ b/cm.dependencies
@@ -3,6 +3,10 @@
         "repository": "android_device_samsung_smdk4412-common",
         "target_path": "device/samsung/smdk4412-common"
     },
+    {
+        "repository": "android_device_samsung_smdk4412-qcom-common",
+        "target_path": "device/samsung/smdk4412-qcom-common"
+    },
     {
         "repository": "android_kernel_samsung_smdk4412",
         "target_path": "kernel/samsung/smdk4412"
diff --git a/configs/gps.xml b/configs/gps.xml
deleted file mode 100644
index d482215..0000000
--- a/configs/gps.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/glconfig.xsd" >
-  <!--HAL Confguration  -->
-  <hal
-       acPortName="/dev/ttySAC1"
-       lBaudRate="921600"
-       gpioNStdbyPath="/sys/class/sec/gps/GPS_PWR_EN/value"
-       gpioDelayMs="250"
-       acNvStoDir="/data/gps/"
-       FactoryTestFilePath="/data/"
-
-       Log="JAVA"
-       acLogDirectory="/sdcard/gps/broadcom/storage"
-
-       TISEnabled="true"
-       LPmode="false"
-       cp-cold-start="false"
-       cp-guard-time-sec="1"
-
-       arp-supl-enable="true"
-       arp-supl-cap-msb="true"
-       arp-supl-cap-msa="true"
-       arp-supl-cap-ecid="false"
-       arp-supl-use-apn="false"
-       acSuplServer="supl.google.com"
-       SuplPort="7276"
-       tlsCertPath="/system/bin/gps.cer"
-       tlsEnable="false"
-       ReAidingIntervalSec="1200"
-       SuplUT1Seconds="20"
-       SuplUT2Seconds="20"
-       SuplUT3Seconds="20"
-       SuplVersion="1"
-
-       LbsEnable="true"
-       LbsLocal="false"
-       LbsServer="BCMLS2.glpals.com"
-       LbsPort="7275"
-       LbsSyncLto="false"
-       SyncLto="true"
-       ltoFileName="lto2.dat"
-       acLtoDir="/data/gps/"
-       LbsSyncLtoThresholdDays="1"
-       LbsTAC="10101106"
-       ctrlPipe="/data/gps/glgpsctrl"
-       LbsWlanEnable="false"
-
-       IgnoreJniTime="true"
-       AssertEnabled="false"
-       SensorsTimePeriodGyroMs="20"
-       SensorsTimePeriodAcclMs="20"
-
-
-   />
-
-  <gll
-       LogPriMask="LOG_INFO"
-       LogFacMask="LOG_RAWDATA | LOG_DEVKF | LOG_GLLAPI | LOG_NMEA"
-       FrqPlan="FRQ_PLAN_26MHZ_2PPM_26MHZ_300PPB"
-       RfType="GL_RF_4752_BRCM_EXT_LNA"
-       WarmStandbyTimeout1Seconds="10"
-       WarmStandbyTimeout2Seconds="15"
-  >
-  </gll>
-
-  <gll_features
-       EnableLowPowerEls="false"
-       EnableLowPowerPmm="true"
-  />
-
-</glgps>
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 1f94c41..2304ed1 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -19,12 +19,8 @@ system/lib/libdiag.so
 system/lib/libdsi_netctrl.so
 system/lib/libdsutils.so
 system/lib/libfactoryutil.so
-system/lib/libgps.so
-system/lib/libgps.utils.so
 system/lib/libidl.so
-system/lib/libloc_adapter.so
 system/lib/libloc_api_v02.so
-system/lib/libloc_eng.so
 system/lib/libnetmgr.so
 system/lib/libomission_avoidance.so
 system/lib/libqcci_legacy.so
@@ -44,7 +40,6 @@ system/lib/libsecnativefeature.so
 system/lib/libsecril-client.so
 system/lib/libsensorhubservice.so
 system/lib/hw/vendor-camera.exynos4.so
-system/lib/hw/gps.default.so
 system/lib/hw/sensorhubs.smdk4x12.so
 system/lib/hw/sensors.smdk4x12.so
 system/usr/idc/sec_e-pen.idc
diff --git a/t0lte.mk b/t0lte.mk
index 55db196..4965ed1 100644
--- a/t0lte.mk
+++ b/t0lte.mk
@@ -37,9 +37,8 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/tiny_hw.xml:system/etc/sound/t0lte
 
-# Gps
+# GPS
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/gps.xml:system/etc/gps.xml \
     $(LOCAL_PATH)/configs/gps.conf:system/etc/gps.conf
 
 # Product specific Packages
@@ -89,5 +88,6 @@ PRODUCT_COPY_FILES += \
 
 # Include common makefile
 $(call inherit-product, device/samsung/smdk4412-common/common.mk)
+$(call inherit-product, device/samsung/smdk4412-qcom-common/common.mk)
 
 $(call inherit-product-if-exists, vendor/samsung/t0lte/t0lte-vendor.mk)
-- 
cgit v1.2.3