Add flp.msm8960.so and dependencies, move gps.conf
flp.msm8960.so implements fused location provider API
gps.conf moved to hardware/qcom/gps
Change-Id: I8852b6412a72ea2bd17b2ede11415b78dcbe2a07
diff --git a/device.mk b/device.mk
index a8bacc1..e4a10ac 100644
--- a/device.mk
+++ b/device.mk
@@ -108,10 +108,6 @@
frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml \
frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml
-# GPS configuration
-PRODUCT_COPY_FILES += \
- device/lge/mako/gps.conf:system/etc/gps.conf
-
# NFC packages
PRODUCT_PACKAGES += \
nfc_nci.mako \
@@ -223,12 +219,19 @@
libstagefrighthw \
libc2dcolorconvert
+# GPS
PRODUCT_PACKAGES += \
- libloc_adapter \
- libloc_eng \
- libloc_api_v02 \
- libgps.utils \
- gps.msm8960
+ libloc_adapter \
+ libloc_eng \
+ libloc_api_v02 \
+ libloc_ds_api \
+ libloc_core \
+ libizat_core \
+ libgeofence \
+ libgps.utils \
+ gps.conf \
+ gps.msm8960 \
+ flp.msm8960
PRODUCT_PACKAGES += \
bdAddrLoader \
diff --git a/gps.conf b/gps.conf
deleted file mode 100644
index 5ec3cc4..0000000
--- a/gps.conf
+++ /dev/null
@@ -1,84 +0,0 @@
-XTRA_SERVER_1=http://xtra1.gpsonextra.net/xtra2.bin
-XTRA_SERVER_2=http://xtra2.gpsonextra.net/xtra2.bin
-XTRA_SERVER_3=http://xtra3.gpsonextra.net/xtra2.bin
-
-# DEBUG LEVELS: 0 - none, 1 - Error, 2 - Warning, 3 - Info
-# 4 - Debug, 5 - Verbose
-DEBUG_LEVEL = 3
-
-# Intermediate position report, 1=enable, 0=disable
-INTERMEDIATE_POS=0
-
-# supl version 1.0
-SUPL_VER=0x10000
-
-# Error Estimate
-# _SET = 1
-# _CLEAR = 0
-ERR_ESTIMATE=0
-
-# GPS Capabilities bit mask
-# SCHEDULING = 1
-# MSB = 2
-# MSA = 4
-# ULP = 0x20
-# default = MSA | MSB | SCHEDULING | ULP
-CAPABILITIES=0x07
-
-# Accuracy threshold for intermediate positions
-# less accurate positions are ignored, 0 for passing all positions
-# ACCURACY_THRES=5000
-
-################################
-##### AGPS server settings #####
-################################
-
-# FOR SUPL SUPPORT, set the following
-# SUPL_HOST=supl.host.com or IP
-# SUPL_PORT=1234
-SUPL_HOST=supl.google.com
-SUPL_PORT=7275
-
-# FOR C2K PDE SUPPORT, set the following
-# C2K_HOST=c2k.pde.com or IP
-# C2K_PORT=1234
-
-################################
-# Sensor Settings
-################################
-
-# Needs to be set explicitly based on sensor
-# There is no default value.
-#GYRO_BIAS_RANDOM_WALK=
-
-SENSOR_ACCEL_BATCHES_PER_SEC=2
-SENSOR_ACCEL_SAMPLES_PER_BATCH=5
-SENSOR_GYRO_BATCHES_PER_SEC=2
-SENSOR_GYRO_SAMPLES_PER_BATCH=5
-
-# Sensor Control Mode (0=AUTO, 1=FORCE_ON)
-SENSOR_CONTROL_MODE=0
-
-# Enable or Disable Sensors for GPS use (0=Enable, 1=Disable)
-SENSOR_USAGE=1
-
-# Choose GSIFF sensor provider (1=DSPS, 2=Android NDK)
-SENSOR_PROVIDER=1
-
-################################
-# Indoor Positioning Settings
-################################
-# 0: QUIPC disabled, 1: QUIPC enabled, 2: forced QUIPC only
-QUIPC_ENABLED = 0
-
-################################
-# EXTRA SETTINGS
-################################
-# Enable or Disable Wiper (1=Enable, 0=Disable)
-ENABLE_WIPER=0
-
-####################################
-# LTE Positioning Profile Settings
-####################################
-# 0: Enable RRLP on LTE(Default) 1: Enable LPP_User_Plane on LTE
-LPP_PROFILE = 0
