From a161d06a5cb343980aee60443925297a3028e5a6 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Fri, 12 Mar 2010 14:02:56 -0800 Subject: Move gps.conf to a common location Change-Id: I9e398ed81484d0f4e0c623dad47a7167b6b86ffa --- gps.conf_AS | 6 ------ gps.conf_EU | 6 ------ gps.conf_US | 6 ------ passion_as.mk | 6 ++---- passion_eu.mk | 6 ++---- passion_us.mk | 6 ++---- 6 files changed, 6 insertions(+), 30 deletions(-) delete mode 100644 gps.conf_AS delete mode 100644 gps.conf_EU delete mode 100644 gps.conf_US diff --git a/gps.conf_AS b/gps.conf_AS deleted file mode 100644 index 51154b9..0000000 --- a/gps.conf_AS +++ /dev/null @@ -1,6 +0,0 @@ -NTP_SERVER=asia.pool.ntp.org -XTRA_SERVER_1=http://xtra1.gpsonextra.net/xtra.bin -XTRA_SERVER_2=http://xtra2.gpsonextra.net/xtra.bin -XTRA_SERVER_3=http://xtra3.gpsonextra.net/xtra.bin -SUPL_HOST=supl.google.com -SUPL_PORT=7276 diff --git a/gps.conf_EU b/gps.conf_EU deleted file mode 100644 index 926f884..0000000 --- a/gps.conf_EU +++ /dev/null @@ -1,6 +0,0 @@ -NTP_SERVER=europe.pool.ntp.org -XTRA_SERVER_1=http://xtra1.gpsonextra.net/xtra.bin -XTRA_SERVER_2=http://xtra2.gpsonextra.net/xtra.bin -XTRA_SERVER_3=http://xtra3.gpsonextra.net/xtra.bin -SUPL_HOST=supl.google.com -SUPL_PORT=7276 diff --git a/gps.conf_US b/gps.conf_US deleted file mode 100644 index b766326..0000000 --- a/gps.conf_US +++ /dev/null @@ -1,6 +0,0 @@ -NTP_SERVER=north-america.pool.ntp.org -XTRA_SERVER_1=http://xtra1.gpsonextra.net/xtra.bin -XTRA_SERVER_2=http://xtra2.gpsonextra.net/xtra.bin -XTRA_SERVER_3=http://xtra3.gpsonextra.net/xtra.bin -SUPL_HOST=supl.google.com -SUPL_PORT=7276 diff --git a/passion_as.mk b/passion_as.mk index 58abb9d..7a9a14c 100644 --- a/passion_as.mk +++ b/passion_as.mk @@ -19,10 +19,8 @@ # configured with Asia-specific settings. # -# These are the aspects of the product that are explicitly -# specific to this file -PRODUCT_COPY_FILES := \ - device/htc/passion/gps.conf_AS:system/etc/gps.conf +# The gps config appropriate for this device +$(call inherit-product, device/common/gps/gps_as_supl.mk) # The rest of the configuration is inherited from a generic config $(call inherit-product, device/htc/passion/passion.mk) diff --git a/passion_eu.mk b/passion_eu.mk index 121c2ad..7e8a9f7 100644 --- a/passion_eu.mk +++ b/passion_eu.mk @@ -19,10 +19,8 @@ # configured with Europe-specific settings. # -# These are the aspects of the product that are explicitly -# specific to this file -PRODUCT_COPY_FILES := \ - device/htc/passion/gps.conf_EU:system/etc/gps.conf +# The gps config appropriate for this device +$(call inherit-product, device/common/gps/gps_eu_supl.mk) # The rest of the configuration is inherited from a generic config $(call inherit-product, device/htc/passion/passion.mk) diff --git a/passion_us.mk b/passion_us.mk index f0b9d05..11e7c16 100644 --- a/passion_us.mk +++ b/passion_us.mk @@ -19,10 +19,8 @@ # configured with US-specific settings. # -# These are the aspects of the product that are explicitly -# specific to this file -PRODUCT_COPY_FILES := \ - device/htc/passion/gps.conf_US:system/etc/gps.conf +# The gps config appropriate for this device +$(call inherit-product, device/common/gps/gps_us_supl.mk) # The rest of the configuration is inherited from a generic config $(call inherit-product, device/htc/passion/passion.mk) -- cgit v1.2.3