summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-02-26 13:27:01 -0800
committerJean-Baptiste Queru <jbq@google.com>2010-02-26 13:28:15 -0800
commit785446c8e49fc2543137b792eadae35bde8e541d (patch)
tree965fb2650cf12d07d4d4f7297e019d02939a0b1b
parenta69ecae8810fdc274e02e609f9e3a44891fa433f (diff)
downloadpassion-785446c8e49fc2543137b792eadae35bde8e541d.tar.gz
Use proper inherit-product.
Sanitize the inheritance order: most specific goes first. Also add a few comments. Change-Id: I424e69250f8ce4663e4fb5e65c59d5d0d751ad7c
-rw-r--r--passion.mk11
1 files changed, 9 insertions, 2 deletions
diff --git a/passion.mk b/passion.mk
index 1819940..f081cbe 100644
--- a/passion.mk
+++ b/passion.mk
@@ -14,9 +14,13 @@
# limitations under the License.
#
--include vendor/htc/passion/passion-vendor.mk
+#
+# This is the product configuration for a generic GSM passion,
+# not specialized for any geography.
+#
-PRODUCT_COPY_FILES += \
+# First, the aspects that are specific to GSM
+PRODUCT_COPY_FILES := \
device/htc/passion/init.mahimahi.rc:root/init.mahimahi.rc \
device/htc/passion/bcm4329.ko:system/lib/modules/bcm4329.ko
@@ -28,3 +32,6 @@ endif
PRODUCT_COPY_FILES += \
$(LOCAL_KERNEL):kernel
+
+# Also get non-open-source GSM-specific aspects if available
+$(call inherit-product-if-exists, vendor/htc/passion/passion-vendor.mk)