From 2694f70576e416d921da68efad273163af2813ae Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Sat, 22 Jan 2011 02:53:32 -0500 Subject: [PATCH] Split up common.mk for smaller devices Capable devices now inherit from common_full.mk, where smaller devices can inherit from common.mk. This currently excludes the extra ringtones and built in themes. Change-Id: I604ac29648a7311ba1dcc9a8005b1be1424ce596 --- products/common.mk | 13 +------------ products/common_full.mk | 13 +++++++++++++ products/cyanogen_ace.mk | 2 +- products/cyanogen_bravo.mk | 2 +- products/cyanogen_bravoc.mk | 2 +- products/cyanogen_buzz.mk | 2 +- products/cyanogen_crespo.mk | 2 +- products/cyanogen_espresso.mk | 2 +- products/cyanogen_generic.mk | 2 +- products/cyanogen_glacier.mk | 2 +- products/cyanogen_harmony.mk | 2 +- products/cyanogen_hero.mk | 2 +- products/cyanogen_heroc.mk | 2 +- products/cyanogen_inc.mk | 2 +- products/cyanogen_legend.mk | 2 +- products/cyanogen_liberty.mk | 2 +- products/cyanogen_passion.mk | 2 +- products/cyanogen_sholes.mk | 2 +- products/cyanogen_supersonic.mk | 2 +- products/cyanogen_vision.mk | 2 +- products/cyanogen_z71.mk | 2 +- products/themes.mk | 9 +-------- products/themes_common.mk | 9 +++++++++ 23 files changed, 43 insertions(+), 39 deletions(-) create mode 100644 products/common_full.mk create mode 100644 products/themes_common.mk diff --git a/products/common.mk b/products/common.mk index d113816b..d34a4cfa 100644 --- a/products/common.mk +++ b/products/common.mk @@ -5,10 +5,6 @@ PRODUCT_DEVICE := generic PRODUCT_PACKAGES += ADWLauncher -# Add ROMManager build property -PRODUCT_PROPERTY_OVERRIDES += \ - ro.config.ringtone=DonMessWivIt.ogg - ifdef CYANOGEN_NIGHTLY PRODUCT_PROPERTY_OVERRIDES += \ ro.rommanager.developerid=cyanogenmodnightly @@ -25,9 +21,6 @@ KERNEL_MODULES_DIR:=/system/lib/modules # Tiny toolbox TINY_TOOLBOX:=true -# Enable Windows Media if supported by the board -WITH_WINDOWS_MEDIA:=true - PRODUCT_PROPERTY_OVERRIDES += \ ro.url.legal=http://www.google.com/intl/%s/mobile/android/basic/phone-legal.html \ ro.url.legal.android_privacy=http://www.google.com/intl/%s/mobile/android/basic/privacy.html \ @@ -60,12 +53,8 @@ PRODUCT_COPY_FILES += \ # Common CM overlay PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/common -# Bring in some audio files -include frameworks/base/data/sounds/AudioPackage4.mk -include frameworks/base/data/sounds/AudioPackage5.mk - # T-Mobile theme engine -include vendor/cyanogen/products/themes.mk +include vendor/cyanogen/products/themes_common.mk PRODUCT_COPY_FILES += \ vendor/cyanogen/prebuilt/common/bin/backuptool.sh:system/bin/backuptool.sh \ diff --git a/products/common_full.mk b/products/common_full.mk new file mode 100644 index 00000000..6a15ec5a --- /dev/null +++ b/products/common_full.mk @@ -0,0 +1,13 @@ +# Inherit common CM stuff +$(call inherit-product, vendor/cyanogen/products/common.mk) + +# Bring in all audio files +include frameworks/base/data/sounds/AllAudio.mk + +# Theme packages +include vendor/cyanogen/products/themes.mk + +# Default ringtone +PRODUCT_PROPERTY_OVERRIDES += \ + ro.config.ringtone=DonMessWivIt.ogg + diff --git a/products/cyanogen_ace.mk b/products/cyanogen_ace.mk index 3376a2e5..132f219b 100644 --- a/products/cyanogen_ace.mk +++ b/products/cyanogen_ace.mk @@ -2,7 +2,7 @@ $(call inherit-product, device/htc/ace/ace.mk) # Inherit some common cyanogenmod stuff. -$(call inherit-product, vendor/cyanogen/products/common.mk) +$(call inherit-product, vendor/cyanogen/products/common_full.mk) # Include GSM stuff $(call inherit-product, vendor/cyanogen/products/gsm.mk) diff --git a/products/cyanogen_bravo.mk b/products/cyanogen_bravo.mk index 7c64d794..5ee889a1 100644 --- a/products/cyanogen_bravo.mk +++ b/products/cyanogen_bravo.mk @@ -2,7 +2,7 @@ $(call inherit-product, device/htc/bravo/full_bravo.mk) # Inherit some common cyanogenmod stuff. -$(call inherit-product, vendor/cyanogen/products/common.mk) +$(call inherit-product, vendor/cyanogen/products/common_full.mk) # Include GSM stuff $(call inherit-product, vendor/cyanogen/products/gsm.mk) diff --git a/products/cyanogen_bravoc.mk b/products/cyanogen_bravoc.mk index 6a33ea6e..ddf0084a 100644 --- a/products/cyanogen_bravoc.mk +++ b/products/cyanogen_bravoc.mk @@ -2,7 +2,7 @@ $(call inherit-product, device/htc/bravoc/full_bravoc.mk) # Inherit some common cyanogenmod stuff. -$(call inherit-product, vendor/cyanogen/products/common.mk) +$(call inherit-product, vendor/cyanogen/products/common_full.mk) # # Setup device specific product configuration. diff --git a/products/cyanogen_buzz.mk b/products/cyanogen_buzz.mk index 0cf0b64d..e27fbad4 100644 --- a/products/cyanogen_buzz.mk +++ b/products/cyanogen_buzz.mk @@ -2,7 +2,7 @@ $(call inherit-product, device/htc/buzz/full_buzz.mk) # Inherit some common cyanogenmod stuff. -$(call inherit-product, vendor/cyanogen/products/common.mk) +$(call inherit-product, vendor/cyanogen/products/common_full.mk) # Include GSM stuff $(call inherit-product, vendor/cyanogen/products/gsm.mk) diff --git a/products/cyanogen_crespo.mk b/products/cyanogen_crespo.mk index 6ab153b1..cbfc1323 100644 --- a/products/cyanogen_crespo.mk +++ b/products/cyanogen_crespo.mk @@ -2,7 +2,7 @@ $(call inherit-product, device/samsung/crespo/full_crespo.mk) # Inherit some common cyanogenmod stuff. -$(call inherit-product, vendor/cyanogen/products/common.mk) +$(call inherit-product, vendor/cyanogen/products/common_full.mk) # Include GSM stuff $(call inherit-product, vendor/cyanogen/products/gsm.mk) diff --git a/products/cyanogen_espresso.mk b/products/cyanogen_espresso.mk index e24ed505..5739b0f0 100644 --- a/products/cyanogen_espresso.mk +++ b/products/cyanogen_espresso.mk @@ -2,7 +2,7 @@ $(call inherit-product, device/htc/espresso/espresso.mk) # Inherit some common cyanogenmod stuff. -$(call inherit-product, vendor/cyanogen/products/common.mk) +$(call inherit-product, vendor/cyanogen/products/common_full.mk) # Include GSM stuff $(call inherit-product, vendor/cyanogen/products/gsm.mk) diff --git a/products/cyanogen_generic.mk b/products/cyanogen_generic.mk index 5f1213fc..d22a4583 100644 --- a/products/cyanogen_generic.mk +++ b/products/cyanogen_generic.mk @@ -2,7 +2,7 @@ $(call inherit-product, build/target/product/full.mk) # Inherit some common cyanogenmod stuff. -$(call inherit-product, vendor/cyanogen/products/common.mk) +$(call inherit-product, vendor/cyanogen/products/common_full.mk) # # Setup device specific product configuration. diff --git a/products/cyanogen_glacier.mk b/products/cyanogen_glacier.mk index af13f591..c8068c75 100644 --- a/products/cyanogen_glacier.mk +++ b/products/cyanogen_glacier.mk @@ -2,7 +2,7 @@ $(call inherit-product, device/htc/glacier/glacier.mk) # Inherit some common cyanogenmod stuff. -$(call inherit-product, vendor/cyanogen/products/common.mk) +$(call inherit-product, vendor/cyanogen/products/common_full.mk) # Include GSM stuff $(call inherit-product, vendor/cyanogen/products/gsm.mk) diff --git a/products/cyanogen_harmony.mk b/products/cyanogen_harmony.mk index ae9e96a1..84a761eb 100644 --- a/products/cyanogen_harmony.mk +++ b/products/cyanogen_harmony.mk @@ -1,7 +1,7 @@ $(call inherit-product, device/nvidia/harmony/device_harmony.mk) # Inherit some common cyanogenmod stuff. -$(call inherit-product, vendor/cyanogen/products/common.mk) +$(call inherit-product, vendor/cyanogen/products/common_full.mk) # # Setup device specific product configuration. diff --git a/products/cyanogen_hero.mk b/products/cyanogen_hero.mk index 89e301d7..b8ce29e0 100644 --- a/products/cyanogen_hero.mk +++ b/products/cyanogen_hero.mk @@ -2,7 +2,7 @@ $(call inherit-product, device/htc/hero/full_hero.mk) # Inherit some common cyanogenmod stuff. -$(call inherit-product, vendor/cyanogen/products/common.mk) +$(call inherit-product, vendor/cyanogen/products/common_full.mk) # Include GSM stuff $(call inherit-product, vendor/cyanogen/products/gsm.mk) diff --git a/products/cyanogen_heroc.mk b/products/cyanogen_heroc.mk index e0ea5d99..5080d04c 100644 --- a/products/cyanogen_heroc.mk +++ b/products/cyanogen_heroc.mk @@ -2,7 +2,7 @@ $(call inherit-product, device/htc/heroc/heroc.mk) # Inherit some common cyanogenmod stuff. -$(call inherit-product, vendor/cyanogen/products/common.mk) +$(call inherit-product, vendor/cyanogen/products/common_full.mk) # diff --git a/products/cyanogen_inc.mk b/products/cyanogen_inc.mk index 15b97581..9acc48d0 100644 --- a/products/cyanogen_inc.mk +++ b/products/cyanogen_inc.mk @@ -1,7 +1,7 @@ $(call inherit-product, device/htc/inc/inc.mk) # Inherit some common cyanogenmod stuff. -$(call inherit-product, vendor/cyanogen/products/common.mk) +$(call inherit-product, vendor/cyanogen/products/common_full.mk) # # Setup device specific product configuration. diff --git a/products/cyanogen_legend.mk b/products/cyanogen_legend.mk index 9db82cca..00eca558 100644 --- a/products/cyanogen_legend.mk +++ b/products/cyanogen_legend.mk @@ -2,7 +2,7 @@ $(call inherit-product, device/htc/legend/legend.mk) # Inherit some common cyanogenmod stuff. -$(call inherit-product, vendor/cyanogen/products/common.mk) +$(call inherit-product, vendor/cyanogen/products/common_full.mk) # Include GSM stuff $(call inherit-product, vendor/cyanogen/products/gsm.mk) diff --git a/products/cyanogen_liberty.mk b/products/cyanogen_liberty.mk index 83e5e323..46c89f39 100644 --- a/products/cyanogen_liberty.mk +++ b/products/cyanogen_liberty.mk @@ -2,7 +2,7 @@ $(call inherit-product, device/htc/liberty/liberty.mk) # Inherit some common cyanogenmod stuff. -$(call inherit-product, vendor/cyanogen/products/common.mk) +$(call inherit-product, vendor/cyanogen/products/common_full.mk) # Include GSM stuff $(call inherit-product, vendor/cyanogen/products/gsm.mk) diff --git a/products/cyanogen_passion.mk b/products/cyanogen_passion.mk index f23afee3..6f3079f8 100644 --- a/products/cyanogen_passion.mk +++ b/products/cyanogen_passion.mk @@ -2,7 +2,7 @@ $(call inherit-product, device/htc/passion/full_passion.mk) # Inherit some common cyanogenmod stuff. -$(call inherit-product, vendor/cyanogen/products/common.mk) +$(call inherit-product, vendor/cyanogen/products/common_full.mk) # Include GSM stuff $(call inherit-product, vendor/cyanogen/products/gsm.mk) diff --git a/products/cyanogen_sholes.mk b/products/cyanogen_sholes.mk index 5300e4ff..420789ac 100644 --- a/products/cyanogen_sholes.mk +++ b/products/cyanogen_sholes.mk @@ -2,7 +2,7 @@ $(call inherit-product, device/motorola/sholes/sholes.mk) # Inherit some common cyanogenmod stuff. -$(call inherit-product, vendor/cyanogen/products/common.mk) +$(call inherit-product, vendor/cyanogen/products/common_full.mk) # # Setup device specific product configuration. diff --git a/products/cyanogen_supersonic.mk b/products/cyanogen_supersonic.mk index 946f36c2..580b4789 100644 --- a/products/cyanogen_supersonic.mk +++ b/products/cyanogen_supersonic.mk @@ -2,7 +2,7 @@ $(call inherit-product, device/htc/supersonic/supersonic.mk) # Inherit some common cyanogenmod stuff. -$(call inherit-product, vendor/cyanogen/products/common.mk) +$(call inherit-product, vendor/cyanogen/products/common_full.mk) # # Setup device specific product configuration. diff --git a/products/cyanogen_vision.mk b/products/cyanogen_vision.mk index 85b9d95c..32792c67 100644 --- a/products/cyanogen_vision.mk +++ b/products/cyanogen_vision.mk @@ -2,7 +2,7 @@ $(call inherit-product, device/htc/vision/vision.mk) # Inherit some common cyanogenmod stuff. -$(call inherit-product, vendor/cyanogen/products/common.mk) +$(call inherit-product, vendor/cyanogen/products/common_full.mk) # Include GSM stuff $(call inherit-product, vendor/cyanogen/products/gsm.mk) diff --git a/products/cyanogen_z71.mk b/products/cyanogen_z71.mk index 9e9a3ca9..3b9b5d8c 100644 --- a/products/cyanogen_z71.mk +++ b/products/cyanogen_z71.mk @@ -2,7 +2,7 @@ $(call inherit-product, device/commtiva/z71/device_z71.mk) # Inherit some common cyanogenmod stuff. -$(call inherit-product, vendor/cyanogen/products/common.mk) +$(call inherit-product, vendor/cyanogen/products/common_full.mk) # Include GSM stuff $(call inherit-product, vendor/cyanogen/products/gsm.mk) diff --git a/products/themes.mk b/products/themes.mk index f8a56072..39d6ffa8 100644 --- a/products/themes.mk +++ b/products/themes.mk @@ -1,11 +1,4 @@ -# T-Mobile theme engine +# Theme packages PRODUCT_PACKAGES += \ - ThemeManager \ - ThemeChooser \ - com.tmobile.themes \ Androidian \ Cyanbread - -PRODUCT_COPY_FILES += \ - vendor/cyanogen/prebuilt/common/etc/permissions/com.tmobile.themes.xml:system/etc/permissions/com.tmobile.themes.xml - diff --git a/products/themes_common.mk b/products/themes_common.mk new file mode 100644 index 00000000..a6e651e7 --- /dev/null +++ b/products/themes_common.mk @@ -0,0 +1,9 @@ +# T-Mobile theme engine +PRODUCT_PACKAGES += \ + ThemeManager \ + ThemeChooser \ + com.tmobile.themes + +PRODUCT_COPY_FILES += \ + vendor/cyanogen/prebuilt/common/etc/permissions/com.tmobile.themes.xml:system/etc/permissions/com.tmobile.themes.xml +