summaryrefslogtreecommitdiff
path: root/passion.mk
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-02-26 14:12:51 -0800
committerJean-Baptiste Queru <jbq@google.com>2010-03-01 11:07:52 -0800
commit2d9d190267ed2b3dc1808d97347fd768f1d02619 (patch)
treed89913b5b27deafe105e09e98dea8bb582f7982a /passion.mk
parent785446c8e49fc2543137b792eadae35bde8e541d (diff)
downloadpassion-2d9d190267ed2b3dc1808d97347fd768f1d02619.tar.gz
Inherit from passion-common in a single place.
Since there are no geo-specific passion-common product definitions any more, it makes more sense to "jump" from GSM-specific passion to common passion in a single location. Change-Id: Iadc67155d3d4e81349ff503fdba1fd83f70887c7
Diffstat (limited to 'passion.mk')
-rw-r--r--passion.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/passion.mk b/passion.mk
index f081cbe..299d61d 100644
--- a/passion.mk
+++ b/passion.mk
@@ -19,7 +19,8 @@
# not specialized for any geography.
#
-# First, the aspects that are specific to GSM
+# First, the most specific values, i.e. 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
@@ -35,3 +36,6 @@ PRODUCT_COPY_FILES += \
# Also get non-open-source GSM-specific aspects if available
$(call inherit-product-if-exists, vendor/htc/passion/passion-vendor.mk)
+
+# Finally, the least specific parts, i.e. the non-GSM-specific aspects
+$(call inherit-product, device/htc/passion-common/passion.mk)