From 6d649894f3ed4b253b6a5ef32f5010c75f141b3e Mon Sep 17 00:00:00 2001 From: Andreas Blaesius Date: Sat, 20 Feb 2016 05:58:56 -0800 Subject: espresso-common: remove gps.conf from device tree gps.conf get included from /device/common Change-Id: I8f5f9f838bb2eddb7c7b19a7577222064b2fd3a1 --- configs/gps.conf | 6 ------ espresso-common.mk | 6 +++--- 2 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 configs/gps.conf diff --git a/configs/gps.conf b/configs/gps.conf deleted file mode 100644 index 5015eb0..0000000 --- a/configs/gps.conf +++ /dev/null @@ -1,6 +0,0 @@ -NTP_SERVER=north-america.pool.ntp.org -XTRA_SERVER_1=http://gllto.glpals.com/4day/glo/v2/latest/lto2.dat -XTRA_SERVER_2=http://gllto.glpals.com/4day/glo/v2/latest/lto2.dat -XTRA_SERVER_3=http://gllto.glpals.com/4day/glo/v2/latest/lto2.dat -SUPL_HOST=supl.google.com -SUPL_PORT=7276 diff --git a/espresso-common.mk b/espresso-common.mk index 5d7d4ac..1329261 100644 --- a/espresso-common.mk +++ b/espresso-common.mk @@ -21,9 +21,6 @@ DEVICE_PACKAGE_OVERLAYS += device/samsung/espresso-common/overlay/aosp-common $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk) -# The gps config appropriate for this device -$(call inherit-product, device/common/gps/gps_us_supl.mk) - LOCAL_PATH := device/samsung/espresso-common # Enable higher-res drawables while keeping mdpi as primary source @@ -43,6 +40,9 @@ PRODUCT_PACKAGES += \ init.recovery.espresso.rc # GPS +# gps config appropriate for this device +$(call inherit-product, device/common/gps/gps_us_supl.mk) + PRODUCT_PACKAGES += \ libgpsd-compat -- cgit v1.1