diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-03-12 14:02:56 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-03-12 14:02:56 -0800 |
| commit | 763eec0cee6d057ae39ebf61031bd2264ae7d5b4 (patch) | |
| tree | 04c0d5368da54c879a35167c6a46e39639253636 | |
| parent | cc571bb94ecf2c616090c876baff740d97adfea7 (diff) | |
| download | sapphire-763eec0cee6d057ae39ebf61031bd2264ae7d5b4.tar.gz | |
Move gps.conf to a common location
Change-Id: I048cfe709ed5bf2439119d852b933da6641bde75
| -rw-r--r-- | device_sapphire_as.mk | 4 | ||||
| -rw-r--r-- | device_sapphire_eu.mk | 4 | ||||
| -rw-r--r-- | device_sapphire_us.mk | 4 | ||||
| -rw-r--r-- | gps.conf_AS | 6 | ||||
| -rw-r--r-- | gps.conf_EU | 6 | ||||
| -rw-r--r-- | gps.conf_US | 6 |
6 files changed, 3 insertions, 27 deletions
diff --git a/device_sapphire_as.mk b/device_sapphire_as.mk index cb42fb7..dcea75b 100644 --- a/device_sapphire_as.mk +++ b/device_sapphire_as.mk @@ -14,8 +14,6 @@ # limitations under the License. # -PRODUCT_COPY_FILES := \ - device/htc/sapphire/gps.conf_AS:system/etc/gps.conf - +$(call inherit-product, device/common/gps/gps_as_supl.mk) $(call inherit-product-if-exists, vendor/htc/sapphire/device_sapphire_as-vendor.mk) $(call inherit-product, device/htc/sapphire/device_sapphire.mk) diff --git a/device_sapphire_eu.mk b/device_sapphire_eu.mk index 227db66..d57f7d1 100644 --- a/device_sapphire_eu.mk +++ b/device_sapphire_eu.mk @@ -14,8 +14,6 @@ # limitations under the License. # -PRODUCT_COPY_FILES := \ - device/htc/sapphire/gps.conf_EU:system/etc/gps.conf - +$(call inherit-product, device/common/gps/gps_eu_supl.mk) $(call inherit-product-if-exists, vendor/htc/sapphire/device_sapphire_eu-vendor.mk) $(call inherit-product, device/htc/sapphire/device_sapphire.mk) diff --git a/device_sapphire_us.mk b/device_sapphire_us.mk index a498459..0f47bd2 100644 --- a/device_sapphire_us.mk +++ b/device_sapphire_us.mk @@ -14,8 +14,6 @@ # limitations under the License. # -PRODUCT_COPY_FILES := \ - device/htc/sapphire/gps.conf_US:system/etc/gps.conf - +$(call inherit-product, device/common/gps/gps_us_supl.mk) $(call inherit-product-if-exists, vendor/htc/sapphire/device_sapphire_us-vendor.mk) $(call inherit-product, device/htc/sapphire/device_sapphire.mk) 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 |