diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-03-01 17:17:58 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-01 17:17:58 -0800 |
| commit | 597ab25b7145d8d32b57d528ca599497c0889503 (patch) | |
| tree | e3feb8ce8cb7df3c5e45828fc7119764a53d83db | |
| parent | e5717794b023cf9bb1d311edaaffd5f5f2d02c43 (diff) | |
| parent | ab7bface2a5ba185a6aec34026341049bac4e0ed (diff) | |
| download | passion-597ab25b7145d8d32b57d528ca599497c0889503.tar.gz | |
Merge "Put the most specific parts (GPS settings) first."
| -rw-r--r-- | passion_as.mk | 12 | ||||
| -rw-r--r-- | passion_eu.mk | 12 | ||||
| -rw-r--r-- | passion_us.mk | 12 |
3 files changed, 30 insertions, 6 deletions
diff --git a/passion_as.mk b/passion_as.mk index 1a833c7..58abb9d 100644 --- a/passion_as.mk +++ b/passion_as.mk @@ -14,7 +14,15 @@ # limitations under the License. # -$(call inherit-product, device/htc/passion/passion.mk) +# +# This is the device-specific product configuration for passion, +# configured with Asia-specific settings. +# -PRODUCT_COPY_FILES += \ +# 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 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 2720514..121c2ad 100644 --- a/passion_eu.mk +++ b/passion_eu.mk @@ -14,7 +14,15 @@ # limitations under the License. # -$(call inherit-product, device/htc/passion/passion.mk) +# +# This is the device-specific product configuration for passion, +# configured with Europe-specific settings. +# -PRODUCT_COPY_FILES += \ +# 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 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 be27979..f0b9d05 100644 --- a/passion_us.mk +++ b/passion_us.mk @@ -14,7 +14,15 @@ # limitations under the License. # -$(call inherit-product, device/htc/passion/passion.mk) +# +# This is the device-specific product configuration for passion, +# configured with US-specific settings. +# -PRODUCT_COPY_FILES += \ +# 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 rest of the configuration is inherited from a generic config +$(call inherit-product, device/htc/passion/passion.mk) |