From 11d5cdb86f35335d52d57f74732e3bdd294d8501 Mon Sep 17 00:00:00 2001 From: Diogo Ferreira Date: Thu, 13 Oct 2011 17:39:00 +0100 Subject: [PATCH] vendor: Externalize common version and release names We have been using a system where each vendor makefile needed to be updated for each release. This leads to both redundancy and inconsistency across devices. This patch externalizes version code to the common_versions.mk. As we all know CyanogenMod versioning works as such: MAJOR.MINOR.MAINTENACE.DEVICE_SPECIFIC (i.e. 7.1.0.1) common_versions.mk now contains the first three in the form of the following variables: PRODUCT_VERSION_MAJOR, PRODUCT_VERSION_MINOR, PRODUCT_VERSION_MAINTENANCE. Additionally, each device makefile contains two additional flags which control both the release name (the name that appears in the generated zip) and the device-specific version (empty by default, to be bumped on a per device basis), example: PRODUCT_RELEASE_NAME := XperiaArc-LT15i PRODUCT_VERSION_DEVICE_SPECIFIC := .1 Change-Id: I15d18e27b89ea00109a61cb66e3bffbb061a2ed4 --- products/common_versions.mk | 19 +++++++++++++++++++ products/cyanogen_ace.mk | 21 +++++---------------- products/cyanogen_anzu.mk | 21 +++++---------------- products/cyanogen_blade.mk | 21 +++++---------------- products/cyanogen_bravo.mk | 21 +++++---------------- products/cyanogen_bravoc.mk | 21 +++++---------------- products/cyanogen_buzz.mk | 21 +++++---------------- products/cyanogen_captivatemtd.mk | 21 +++++---------------- products/cyanogen_click.mk | 21 +++++---------------- products/cyanogen_crespo.mk | 21 +++++---------------- products/cyanogen_crespo4g.mk | 21 +++++---------------- products/cyanogen_desirec.mk | 22 ++++++---------------- products/cyanogen_dream_sapphire.mk | 21 +++++---------------- products/cyanogen_droid2.mk | 21 +++++---------------- products/cyanogen_droid2we.mk | 21 +++++---------------- products/cyanogen_encore.mk | 22 +++++----------------- products/cyanogen_es209ra.mk | 21 +++++---------------- products/cyanogen_espresso.mk | 21 +++++---------------- products/cyanogen_fascinatemtd.mk | 21 +++++---------------- products/cyanogen_galaxys2.mk | 21 +++++---------------- products/cyanogen_galaxys2att.mk | 21 +++++---------------- products/cyanogen_galaxysmtd.mk | 21 +++++---------------- products/cyanogen_glacier.mk | 21 +++++---------------- products/cyanogen_hallon.mk | 21 +++++---------------- products/cyanogen_hero.mk | 21 +++++---------------- products/cyanogen_heroc.mk | 22 ++++++---------------- products/cyanogen_inc.mk | 21 +++++---------------- products/cyanogen_jordan.mk | 20 ++++---------------- products/cyanogen_legend.mk | 18 +++++------------- products/cyanogen_leo.mk | 23 +++++------------------ products/cyanogen_liberty.mk | 18 +++++------------- products/cyanogen_mango.mk | 21 +++++---------------- products/cyanogen_mecha.mk | 21 +++++---------------- products/cyanogen_mesmerizemtd.mk | 21 +++++---------------- products/cyanogen_mimmi.mk | 21 +++++---------------- products/cyanogen_morrison.mk | 23 ++++++----------------- products/cyanogen_motus.mk | 21 +++++---------------- products/cyanogen_olympus.mk | 20 ++++---------------- products/cyanogen_one.mk | 19 +++++-------------- products/cyanogen_p990.mk | 21 +++++---------------- products/cyanogen_p999.mk | 21 +++++---------------- products/cyanogen_passion.mk | 21 +++++---------------- products/cyanogen_robyn.mk | 21 +++++---------------- products/cyanogen_saga.mk | 21 +++++---------------- products/cyanogen_shadow.mk | 21 +++++---------------- products/cyanogen_shakira.mk | 21 +++++---------------- products/cyanogen_sholes.mk | 21 +++++---------------- products/cyanogen_showcasemtd.mk | 21 +++++---------------- products/cyanogen_smb_a1002.mk | 21 +++++---------------- products/cyanogen_smb_a1004.mk | 21 +++++---------------- products/cyanogen_smb_a1011.mk | 21 +++++---------------- products/cyanogen_smb_b9701.mk | 21 +++++---------------- products/cyanogen_smultron.mk | 21 +++++---------------- products/cyanogen_speedy.mk | 21 +++++---------------- products/cyanogen_supersonic.mk | 21 +++++---------------- products/cyanogen_u8220.mk | 22 +++++----------------- products/cyanogen_urushi.mk | 21 +++++---------------- products/cyanogen_v9.mk | 21 +++++---------------- products/cyanogen_vega.mk | 21 +++++---------------- products/cyanogen_vibrantmtd.mk | 21 +++++---------------- products/cyanogen_vision.mk | 21 +++++---------------- products/cyanogen_vivo.mk | 21 +++++---------------- products/cyanogen_vivow.mk | 21 +++++---------------- products/cyanogen_z71.mk | 21 +++++---------------- products/cyanogen_zeppelin.mk | 23 ++++++----------------- products/cyanogen_zero.mk | 21 +++++---------------- products/cyanogen_zeus.mk | 21 +++++---------------- products/cyanogen_zeusc.mk | 21 +++++---------------- 68 files changed, 356 insertions(+), 1070 deletions(-) create mode 100644 products/common_versions.mk diff --git a/products/common_versions.mk b/products/common_versions.mk new file mode 100644 index 00000000..247197f0 --- /dev/null +++ b/products/common_versions.mk @@ -0,0 +1,19 @@ +PRODUCT_VERSION_MAJOR = 7 +PRODUCT_VERSION_MINOR = 1 +PRODUCT_VERSION_MAINTENANCE = 0 + +PRODUCT_BUILD_PROP_OVERRIDES += BUILD_DISPLAY_ID=GWK74 + +ifdef CYANOGEN_NIGHTLY + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-$(PRODUCT_VERSION_MAJOR)-$(shell date +%m%d%Y)-NIGHTLY-$(PRODUCT_RELEASE_NAME) +else + ifdef CYANOGEN_RELEASE + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(PRODUCT_RELEASE_NAME) + else + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(PRODUCT_RELEASE_NAME)-KANG + endif +endif + diff --git a/products/cyanogen_ace.mk b/products/cyanogen_ace.mk index 1f6a9e75..44b678e5 100644 --- a/products/cyanogen_ace.mk +++ b/products/cyanogen_ace.mk @@ -15,7 +15,7 @@ PRODUCT_BRAND := htc_wwe PRODUCT_DEVICE := ace PRODUCT_MODEL := Desire HD PRODUCT_MANUFACTURER := HTC -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_ace BUILD_ID=GRI40 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=htc_wwe/htc_ace/ace:2.3.3/GRI40/87995:user/release-keys PRIVATE_BUILD_DESC="2.50.405.2 CL87995 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_ace BUILD_ID=GRI40 BUILD_FINGERPRINT=htc_wwe/htc_ace/ace:2.3.3/GRI40/87995:user/release-keys PRIVATE_BUILD_DESC="2.50.405.2 CL87995 release-keys" # Build kernel #PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL= @@ -31,21 +31,10 @@ PRODUCT_PACKAGES += Torch # Broadcom FM radio $(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk) -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-DesireHD -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-DesireHD - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-DesireHD-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := DesireHD +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy passion specific prebuilt files diff --git a/products/cyanogen_anzu.mk b/products/cyanogen_anzu.mk index 6e6ba0f3..bb35d6d6 100644 --- a/products/cyanogen_anzu.mk +++ b/products/cyanogen_anzu.mk @@ -15,7 +15,7 @@ PRODUCT_BRAND := SEMC PRODUCT_DEVICE := anzu PRODUCT_MODEL := LT15i PRODUCT_MANUFACTURER := Sony Ericsson -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=LT15i BUILD_ID=3.0.1.A.0.145 BUILD_DISPLAY_ID=3.0.1.A.0.145 BUILD_FINGERPRINT=SEMC/LT15i_1247-1061/LT15i:2.3.3/3.0.1.A.0.145/bn_P:user/release-keys PRIVATE_BUILD_DESC="LT15i-user 2.3.3 3.0.1.A.0.145 bn_P test-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=LT15i BUILD_ID=3.0.1.A.0.145 BUILD_FINGERPRINT=SEMC/LT15i_1247-1061/LT15i:2.3.3/3.0.1.A.0.145/bn_P:user/release-keys PRIVATE_BUILD_DESC="LT15i-user 2.3.3 3.0.1.A.0.145 bn_P test-keys" # Build kernel #PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL= @@ -32,21 +32,10 @@ PRODUCT_PACKAGES += Torch # BCM FM radio #$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk) -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-XperiaArc-LT15i -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-XperiaArc-LT15i - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-XperiaArc-LT15i-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := XperiaArc-LT15i +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy passion specific prebuilt files diff --git a/products/cyanogen_blade.mk b/products/cyanogen_blade.mk index d09c82b8..60dff49f 100644 --- a/products/cyanogen_blade.mk +++ b/products/cyanogen_blade.mk @@ -15,23 +15,12 @@ PRODUCT_BRAND := zte PRODUCT_DEVICE := blade PRODUCT_MODEL := Blade PRODUCT_MANUFACTURER := ZTE -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=blade BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=blade BUILD_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys" -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Blade -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Blade - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Blade-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := Blade +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy legend specific prebuilt files diff --git a/products/cyanogen_bravo.mk b/products/cyanogen_bravo.mk index aaa9902b..42b05abd 100644 --- a/products/cyanogen_bravo.mk +++ b/products/cyanogen_bravo.mk @@ -15,7 +15,7 @@ PRODUCT_BRAND := htc_wwe PRODUCT_DEVICE := bravo PRODUCT_MODEL := HTC Desire PRODUCT_MANUFACTURER := HTC -PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=GRI40 BUILD_DISPLAY_ID=GWK74 PRODUCT_NAME=htc_bravo BUILD_FINGERPRINT=htc_wwe/htc_bravo/bravo:2.3.3/GRI40/96875.1:user/release-keys TARGET_BUILD_TYPE=userdebug BUILD_VERSION_TAGS=release-keys PRIVATE_BUILD_DESC="3.14.405.1 CL96875 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=GRI40 PRODUCT_NAME=htc_bravo BUILD_FINGERPRINT=htc_wwe/htc_bravo/bravo:2.3.3/GRI40/96875.1:user/release-keys TARGET_BUILD_TYPE=userdebug BUILD_VERSION_TAGS=release-keys PRIVATE_BUILD_DESC="3.14.405.1 CL96875 release-keys" # Build kernel PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL= @@ -37,21 +37,10 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.ril.oem.nosim.ecclist=911,112,113,115,117,999,000,08,118,120,122,110,119,995 \ ro.ril.emc.mode=2 -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Desire -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Desire - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Desire-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := Desire +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy passion specific prebuilt files diff --git a/products/cyanogen_bravoc.mk b/products/cyanogen_bravoc.mk index 48b0288c..a0259b26 100644 --- a/products/cyanogen_bravoc.mk +++ b/products/cyanogen_bravoc.mk @@ -12,7 +12,7 @@ PRODUCT_BRAND := us_cellular_wwe PRODUCT_DEVICE := bravoc PRODUCT_MODEL := HTC Desire CDMA PRODUCT_MANUFACTURER := HTC -PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=GRI40 BUILD_DISPLAY_ID=GWK74 PRODUCT_NAME=htc_bravo BUILD_FINGERPRINT=htc_wwe/htc_bravo/bravo:2.3.3/GRI40/96875.1:user/release-keys TARGET_BUILD_TYPE=userdebug BUILD_VERSION_TAGS=release-keys PRIVATE_BUILD_DESC="3.14.405.1 CL96875 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=GRI40 PRODUCT_NAME=htc_bravo BUILD_FINGERPRINT=htc_wwe/htc_bravo/bravo:2.3.3/GRI40/96875.1:user/release-keys TARGET_BUILD_TYPE=userdebug BUILD_VERSION_TAGS=release-keys PRIVATE_BUILD_DESC="3.14.405.1 CL96875 release-keys" # Build kernel PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL= @@ -25,21 +25,10 @@ PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/bravo # Add the Torch app PRODUCT_PACKAGES += Torch -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-BravoC -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-BravoC - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-BravoC-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := BravoC +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy passion specific prebuilt files diff --git a/products/cyanogen_buzz.mk b/products/cyanogen_buzz.mk index f2fba9a4..1ea231a8 100644 --- a/products/cyanogen_buzz.mk +++ b/products/cyanogen_buzz.mk @@ -15,7 +15,7 @@ PRODUCT_BRAND := htc_wwe PRODUCT_DEVICE := buzz PRODUCT_MODEL := HTC Wildfire PRODUCT_MANUFACTURER := HTC -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_buzz BUILD_ID=GRI40 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=google/passion/passion:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.3 GRI40 102588 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_buzz BUILD_ID=GRI40 BUILD_FINGERPRINT=google/passion/passion:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.3 GRI40 102588 release-keys" # Add LDPI assets, in addition to MDPI PRODUCT_LOCALES += ldpi mdpi @@ -33,18 +33,7 @@ PRODUCT_PACKAGES += Torch PRODUCT_COPY_FILES += \ vendor/cyanogen/prebuilt/ldpi/media/bootanimation.zip:system/media/bootanimation.zip -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-buzz -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-buzz - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-buzz-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := buzz +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk diff --git a/products/cyanogen_captivatemtd.mk b/products/cyanogen_captivatemtd.mk index 9b4738b1..e51787cd 100644 --- a/products/cyanogen_captivatemtd.mk +++ b/products/cyanogen_captivatemtd.mk @@ -15,7 +15,7 @@ PRODUCT_BRAND := samsung PRODUCT_DEVICE := captivatemtd PRODUCT_MODEL := SGH-I897 PRODUCT_MANUFACTURER := samsung -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=soju BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=google/soju/crespo:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.4 GRJ22 121341 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=soju BUILD_ID=GRJ22 BUILD_FINGERPRINT=google/soju/crespo:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.4 GRJ22 121341 release-keys" # Build kernel #PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL= @@ -36,21 +36,10 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.additionalmounts=/mnt/emmc \ ro.vold.switchablepair=/mnt/sdcard,/mnt/emmc -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Captivate -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Captivate - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Captivate-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := Captivate +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy captivate specific prebuilt files diff --git a/products/cyanogen_click.mk b/products/cyanogen_click.mk index a279e02d..c577386d 100644 --- a/products/cyanogen_click.mk +++ b/products/cyanogen_click.mk @@ -21,7 +21,7 @@ PRODUCT_BRAND := htc_wwe PRODUCT_DEVICE := click PRODUCT_MODEL := HTC Tattoo PRODUCT_MANUFACTURER := HTC -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_click BUILD_ID=GRI40 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=google/passion/passion:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.3 GRI40 102588 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_click BUILD_ID=GRI40 BUILD_FINGERPRINT=google/passion/passion:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.3 GRI40 102588 release-keys" # Add LDPI assets, in addition to MDPI PRODUCT_LOCALES += ldpi mdpi @@ -33,18 +33,7 @@ PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/ldpi PRODUCT_COPY_FILES += \ vendor/cyanogen/prebuilt/ldpi/media/bootanimation.zip:system/media/bootanimation.zip -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-click -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-click - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-click-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := click +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk diff --git a/products/cyanogen_crespo.mk b/products/cyanogen_crespo.mk index ca230b3b..bc8720f4 100644 --- a/products/cyanogen_crespo.mk +++ b/products/cyanogen_crespo.mk @@ -15,7 +15,7 @@ PRODUCT_BRAND := google PRODUCT_DEVICE := crespo PRODUCT_MODEL := Nexus S PRODUCT_MANUFACTURER := samsung -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=soju BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=google/soju/crespo:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.4 GRJ22 121341 release-keys" BUILD_NUMBER=121341 +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=soju BUILD_ID=GRJ22 BUILD_FINGERPRINT=google/soju/crespo:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.4 GRJ22 121341 release-keys" BUILD_NUMBER=121341 # Extra Crespo overlay PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/crespo @@ -29,21 +29,10 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.ril.oem.nosim.ecclist=911,112,999,000,08,118,120,122,110,119,995 \ ro.ril.emc.mode=2 -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-NS -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-NS - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-NS-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := NS +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy crespo specific prebuilt files diff --git a/products/cyanogen_crespo4g.mk b/products/cyanogen_crespo4g.mk index d36b2d85..a5c09a26 100644 --- a/products/cyanogen_crespo4g.mk +++ b/products/cyanogen_crespo4g.mk @@ -12,7 +12,7 @@ PRODUCT_BRAND := google PRODUCT_DEVICE := crespo4g PRODUCT_MODEL := Nexus S 4G PRODUCT_MANUFACTURER := samsung -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=sojus BUILD_ID=GRJ90 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=google/sojus/crespo4g:2.3.5/GRJ90/138666:user/release-keys PRIVATE_BUILD_DESC="sojus-user 2.3.5 GRJ90 138666 release-keys" BUILD_NUMBER=138666 +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=sojus BUILD_ID=GRJ90 BUILD_FINGERPRINT=google/sojus/crespo4g:2.3.5/GRJ90/138666:user/release-keys PRIVATE_BUILD_DESC="sojus-user 2.3.5 GRJ90 138666 release-keys" BUILD_NUMBER=138666 # Extra Crespo overlay PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/crespo4g @@ -20,21 +20,10 @@ PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/crespo4g # Add the Torch app PRODUCT_PACKAGES += Torch -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-NS4G -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-NS4G - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-NS4G-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := NS4G +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy crespo specific prebuilt files diff --git a/products/cyanogen_desirec.mk b/products/cyanogen_desirec.mk index 547aa43c..9844e92c 100644 --- a/products/cyanogen_desirec.mk +++ b/products/cyanogen_desirec.mk @@ -15,7 +15,7 @@ PRODUCT_BRAND := verizon PRODUCT_DEVICE := desirec PRODUCT_MODEL := ERIS PRODUCT_MANUFACTURER := HTC -PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=GRI40 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=google/passion/passion:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.3 GRI40 102588 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=GRI40 BUILD_FINGERPRINT=google/passion/passion:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.3 GRI40 102588 release-keys" # Use Prebuilt kernel from desirec device tree PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=device/htc/desirec/kernel @@ -25,21 +25,11 @@ PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/heroc # Enable Windows Media WITH_WINDOWS_MEDIA := true -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Eris -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Eris - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-KANG-Eris - endif -endif + +# Release name and versioning +PRODUCT_RELEASE_NAME := Eris +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy dream/sapphire specific prebuilt files diff --git a/products/cyanogen_dream_sapphire.mk b/products/cyanogen_dream_sapphire.mk index d325e7b4..1c878c17 100644 --- a/products/cyanogen_dream_sapphire.mk +++ b/products/cyanogen_dream_sapphire.mk @@ -15,7 +15,7 @@ PRODUCT_BRAND := google PRODUCT_DEVICE := dream_sapphire PRODUCT_MODEL := Dream/Sapphire PRODUCT_MANUFACTURER := HTC -PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRG83 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=tmobile/opal/sapphire/sapphire:2.2.1/FRG83/60505:user/release-keys PRIVATE_BUILD_DESC="opal-user 2.2.1 FRG83 60505 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRG83 BUILD_FINGERPRINT=tmobile/opal/sapphire/sapphire:2.2.1/FRG83/60505:user/release-keys PRIVATE_BUILD_DESC="opal-user 2.2.1 FRG83 60505 release-keys" # Build kernel #PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL= @@ -36,21 +36,10 @@ PRODUCT_COPY_FILES += \ PRODUCT_PROPERTY_OVERRIDES += \ ro.compcache.default=18 -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-DS -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-RC1-DS - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-RC1-DS-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := DS +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # Use the audio profile hack WITH_DS_HTCACOUSTIC_HACK := true diff --git a/products/cyanogen_droid2.mk b/products/cyanogen_droid2.mk index 9ea26860..30d03fed 100644 --- a/products/cyanogen_droid2.mk +++ b/products/cyanogen_droid2.mk @@ -13,23 +13,12 @@ PRODUCT_DEVICE := droid2 PRODUCT_MODEL := DROID2 PRODUCT_MANUFACTURER := Motorola -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1-$(shell date +%m%d%Y)-NIGHTLY-DROID2 -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-RC0-DROID2 - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-RC0-DROID2-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := DROID2 +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk -PRODUCT_BUILD_PROP_OVERRIDES := BUILD_ID=VZW BUILD_DISPLAY_ID=GRH78C PRODUCT_NAME=droid2_vzw TARGET_DEVICE=cdma_droid2 BUILD_FINGERPRINT=verizon/droid2_vzw/cdma_droid2/droid2:2.2/VZW/23.20:user/ota-rel-keys,release-keys PRODUCT_BRAND=verizon PRIVATE_BUILD_DESC="cdma_droid2-user 2.2 VZW 2.3.20 ota-rel-keys,release-keys" BUILD_NUMBER=2.3.20 BUILD_UTC_DATE=1284778494 TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=release-keys USER=dbretzm1 +PRODUCT_BUILD_PROP_OVERRIDES := BUILD_ID=VZW PRODUCT_NAME=droid2_vzw TARGET_DEVICE=cdma_droid2 BUILD_FINGERPRINT=verizon/droid2_vzw/cdma_droid2/droid2:2.2/VZW/23.20:user/ota-rel-keys,release-keys PRODUCT_BRAND=verizon PRIVATE_BUILD_DESC="cdma_droid2-user 2.2 VZW 2.3.20 ota-rel-keys,release-keys" BUILD_NUMBER=2.3.20 BUILD_UTC_DATE=1284778494 TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=release-keys USER=dbretzm1 PRODUCT_COPY_FILES += \ vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip diff --git a/products/cyanogen_droid2we.mk b/products/cyanogen_droid2we.mk index d149020e..56171f71 100644 --- a/products/cyanogen_droid2we.mk +++ b/products/cyanogen_droid2we.mk @@ -15,7 +15,7 @@ PRODUCT_BRAND := motorola PRODUCT_DEVICE := droid2we PRODUCT_MODEL := DROID2 GLOBAL PRODUCT_MANUFACTURER := Motorola -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=droid2we_vzw BUILD_ID=S273 BUILD_DISPLAY_ID=VZW BUILD_FINGERPRINT=verizon/droid2we_vzw/cdma_droid2we/droid2we:2.2/S273/2.4.330:user/ota-rel-keys,release-keys PRIVATE_BUILD_DESC="cdma_droid2we-user 2.2 S273 2.4.330 ota-rel-keys,release-keys" TARGET_DEVICE=cdma_droid2we PRODUCT_BRAND=verizon BUILD_NUMBER=2.4.330 BUILD_UTC_DATE=1287722464 TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=release-keys USER=xrpk47 +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=droid2we_vzw BUILD_ID=S273 BUILD_FINGERPRINT=verizon/droid2we_vzw/cdma_droid2we/droid2we:2.2/S273/2.4.330:user/ota-rel-keys,release-keys PRIVATE_BUILD_DESC="cdma_droid2we-user 2.2 S273 2.4.330 ota-rel-keys,release-keys" TARGET_DEVICE=cdma_droid2we PRODUCT_BRAND=verizon BUILD_NUMBER=2.4.330 BUILD_UTC_DATE=1287722464 TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=release-keys USER=xrpk47 # Build kernel #PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL= @@ -34,21 +34,10 @@ PRODUCT_PACKAGES += Torch # Broadcom FM radio #$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk) -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-DROID2WE-KANG -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-DROID2WE - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-DROID2WE-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := DROID2WE +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy Droid2WE specific prebuilt files diff --git a/products/cyanogen_encore.mk b/products/cyanogen_encore.mk index 7d3d47e6..19eefbfa 100644 --- a/products/cyanogen_encore.mk +++ b/products/cyanogen_encore.mk @@ -12,28 +12,16 @@ PRODUCT_BRAND := bn PRODUCT_DEVICE := encore PRODUCT_MODEL := NookColor PRODUCT_MANUFACTURER := bn -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=encore BUILD_ID=GRK39F BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=google/passion/passion:2.3.6/GRK39F/189904:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.6 GRK39F 189904 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=encore BUILD_ID=GRK39F BUILD_FINGERPRINT=google/passion/passion:2.3.6/GRK39F/189904:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.6 GRK39F 189904 release-keys" PRODUCT_PACKAGE_OVERLAYS += \ vendor/cyanogen/overlay/tablet \ vendor/cyanogen/overlay/encore -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-encore -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-encore - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-encore-KANG - endif -endif - +# Release name and versioning +PRODUCT_RELEASE_NAME := encore +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk PRODUCT_COPY_FILES += \ vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip diff --git a/products/cyanogen_es209ra.mk b/products/cyanogen_es209ra.mk index abdebcee..ed2bb2cd 100644 --- a/products/cyanogen_es209ra.mk +++ b/products/cyanogen_es209ra.mk @@ -15,26 +15,15 @@ PRODUCT_BRAND := SEMC PRODUCT_DEVICE := es209ra PRODUCT_MODEL := X10i PRODUCT_MANUFACTURER := Sony Ericsson -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=X10i BUILD_ID=3.0.1.G.0.75 BUILD_DISPLAY_ID=3.0.1.G.0.75 BUILD_FINGERPRINT=SEMC/X10i_1241-1846/X10i:2.3.3/3.0.1.G.0.75/tB_P:user/release-keys PRIVATE_BUILD_DESC="X10i-user 2.3.3 3.0.1.G.0.75 tB_P test-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=X10i BUILD_ID=3.0.1.G.0.75 BUILD_FINGERPRINT=SEMC/X10i_1241-1846/X10i:2.3.3/3.0.1.G.0.75/tB_P:user/release-keys PRIVATE_BUILD_DESC="X10i-user 2.3.3 3.0.1.G.0.75 tB_P test-keys" # Add the Torch app PRODUCT_PACKAGES += Torch -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-es209ra -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-es209ra - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-es209ra-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := es209ra +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy passion specific prebuilt files diff --git a/products/cyanogen_espresso.mk b/products/cyanogen_espresso.mk index 0288a12a..733e4b9c 100644 --- a/products/cyanogen_espresso.mk +++ b/products/cyanogen_espresso.mk @@ -15,7 +15,7 @@ PRODUCT_BRAND := tmobile PRODUCT_DEVICE := espresso PRODUCT_MODEL := T-Mobile myTouch 3G Slide PRODUCT_MANUFACTURER := HTC -PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=GRI40 BUILD_DISPLAY_ID=GWK74 PRODUCT_NAME=htc_espresso BUILD_FINGERPRINT=google/passion/passion:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.3 GRI40 102588 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=GRI40 PRODUCT_NAME=htc_espresso BUILD_FINGERPRINT=google/passion/passion:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.3 GRI40 102588 release-keys" PRODUCT_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-msm722x.map @@ -28,21 +28,10 @@ PRODUCT_PACKAGES += Torch # Build GanOptimizer PRODUCT_PACKAGES += GanOptimizer -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Slide -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Slide - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Slide-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := Slide +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy espresso specific prebuilt files diff --git a/products/cyanogen_fascinatemtd.mk b/products/cyanogen_fascinatemtd.mk index 5407cb99..b9968ee1 100644 --- a/products/cyanogen_fascinatemtd.mk +++ b/products/cyanogen_fascinatemtd.mk @@ -12,7 +12,7 @@ PRODUCT_BRAND := samsung PRODUCT_DEVICE := fascinatemtd PRODUCT_MODEL := SCH-I500 PRODUCT_MANUFACTURER := samsung -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=soju BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=google/soju/crespo:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.4 GRJ22 121341 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=soju BUILD_ID=GRJ22 BUILD_FINGERPRINT=google/soju/crespo:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.4 GRJ22 121341 release-keys" # Extra fascinatemtd overlay PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/fascinatemtd @@ -20,21 +20,10 @@ PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/fascinatemtd # Add the Torch app PRODUCT_PACKAGES += Torch -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Fascinate -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Fascinate - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Fascinate-KANG-$(shell date +%m%d) - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := Fascinate +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy galaxys specific prebuilt files diff --git a/products/cyanogen_galaxys2.mk b/products/cyanogen_galaxys2.mk index c7b62ec6..1b733121 100644 --- a/products/cyanogen_galaxys2.mk +++ b/products/cyanogen_galaxys2.mk @@ -15,7 +15,7 @@ PRODUCT_BRAND := samsung PRODUCT_DEVICE := galaxys2 PRODUCT_MODEL := GT-I9100 PRODUCT_MANUFACTURER := samsung -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=GT-I9100 BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=samsung/GT-I9100/GT-I9100:2.3.4/GINGERBREAD/XXKG2:user/release-keys PRIVATE_BUILD_DESC="GT-I9100-user 2.3.4 GINGERBREAD XXKG2 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=GT-I9100 BUILD_ID=GRJ22 BUILD_FINGERPRINT=samsung/GT-I9100/GT-I9100:2.3.4/GINGERBREAD/XXKG2:user/release-keys PRIVATE_BUILD_DESC="GT-I9100-user 2.3.4 GINGERBREAD XXKG2 release-keys" # Extra captivate overlay PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/galaxys2 @@ -36,21 +36,10 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.additionalmounts=/mnt/emmc \ ro.vold.switchablepair=/mnt/sdcard,/mnt/emmc -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-GalaxyS2 -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-GalaxyS2 - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-GalaxyS2-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := GalaxyS2 +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy captivate specific prebuilt files diff --git a/products/cyanogen_galaxys2att.mk b/products/cyanogen_galaxys2att.mk index baa16522..24e0e31e 100644 --- a/products/cyanogen_galaxys2att.mk +++ b/products/cyanogen_galaxys2att.mk @@ -15,7 +15,7 @@ PRODUCT_BRAND := samsung PRODUCT_DEVICE := galaxys2att PRODUCT_MODEL := SGH-I777 PRODUCT_MANUFACTURER := samsung -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=SGH-I777 BUILD_ID=GWK74 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=samsung/SGH-I777/SGH-I777:2.3.7/GINGERBREAD/UCKH7:user/release-keys PRIVATE_BUILD_DESC="SGH-I777-user 2.3.7 GINGERBREAD UCKH7 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=SGH-I777 BUILD_ID=GWK74 BUILD_FINGERPRINT=samsung/SGH-I777/SGH-I777:2.3.7/GINGERBREAD/UCKH7:user/release-keys PRIVATE_BUILD_DESC="SGH-I777-user 2.3.7 GINGERBREAD UCKH7 release-keys" # Extra captivate overlay PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/galaxys2att @@ -36,21 +36,10 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.additionalmounts=/mnt/emmc \ ro.vold.switchablepair=/mnt/sdcard,/mnt/emmc -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Galaxys2ATT -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Galaxys2ATT - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Galaxys2ATT-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := Galaxys2ATT +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy captivate specific prebuilt files diff --git a/products/cyanogen_galaxysmtd.mk b/products/cyanogen_galaxysmtd.mk index a2606938..9496fd99 100644 --- a/products/cyanogen_galaxysmtd.mk +++ b/products/cyanogen_galaxysmtd.mk @@ -15,7 +15,7 @@ PRODUCT_BRAND := samsung PRODUCT_DEVICE := galaxysmtd PRODUCT_MODEL := GT-I9000 PRODUCT_MANUFACTURER := samsung -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=soju BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=google/soju/crespo:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.4 GRJ22 121341 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=soju BUILD_ID=GRJ22 BUILD_FINGERPRINT=google/soju/crespo:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.4 GRJ22 121341 release-keys" # Build kernel #PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL= @@ -39,21 +39,10 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.additionalmounts=/mnt/emmc \ ro.vold.switchablepair=/mnt/sdcard,/mnt/emmc -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-GalaxyS -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-GalaxyS - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-GalaxyS-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := GalaxyS +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy galaxys specific prebuilt files diff --git a/products/cyanogen_glacier.mk b/products/cyanogen_glacier.mk index 4446bc50..116d4310 100644 --- a/products/cyanogen_glacier.mk +++ b/products/cyanogen_glacier.mk @@ -15,7 +15,7 @@ PRODUCT_BRAND := tmobile PRODUCT_DEVICE := glacier PRODUCT_MODEL := HTC Glacier PRODUCT_MANUFACTURER := HTC -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_glacier BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=tmobile/htc_glacier/glacier:2.3.4/GRJ22/95282:user/release-keys PRIVATE_BUILD_DESC="2.19.531.1 CL95282 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_glacier BUILD_ID=GRJ22 BUILD_FINGERPRINT=tmobile/htc_glacier/glacier:2.3.4/GRJ22/95282:user/release-keys PRIVATE_BUILD_DESC="2.19.531.1 CL95282 release-keys" # Build kernel #PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL= @@ -34,21 +34,10 @@ PRODUCT_PACKAGES += GanOptimizer # Broadcom FM radio $(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk) -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-glacier -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-glacier - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-glacier-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := glacier +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy passion specific prebuilt files diff --git a/products/cyanogen_hallon.mk b/products/cyanogen_hallon.mk index be847c95..c707295d 100644 --- a/products/cyanogen_hallon.mk +++ b/products/cyanogen_hallon.mk @@ -15,7 +15,7 @@ PRODUCT_BRAND := SEMC PRODUCT_DEVICE := hallon PRODUCT_MODEL := MT15i PRODUCT_MANUFACTURER := Sony Ericsson -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=MT15i BUILD_ID=3.0.1.A.0.145 BUILD_DISPLAY_ID=3.0.1.A.0.145 BUILD_FINGERPRINT=SEMC/MT15i_1247-0875/MT15i:2.3.3/3.0.1.A.0.145/bn_P:user/release-keys PRIVATE_BUILD_DESC="MT15i-user 2.3.3 3.0.1.A.0.145 bn_P test-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=MT15i BUILD_ID=3.0.1.A.0.145 BUILD_FINGERPRINT=SEMC/MT15i_1247-0875/MT15i:2.3.3/3.0.1.A.0.145/bn_P:user/release-keys PRIVATE_BUILD_DESC="MT15i-user 2.3.3 3.0.1.A.0.145 bn_P test-keys" # Build kernel #PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL= @@ -32,21 +32,10 @@ PRODUCT_PACKAGES += Torch # BCM FM radio #$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk) -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-XperiaNeo-MT15i -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-XperiaNeo-MT15i - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-XperiaNeo-MT15i-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := XperiaNeo-MT15i +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy passion specific prebuilt files diff --git a/products/cyanogen_hero.mk b/products/cyanogen_hero.mk index b309afbf..ec4c82ec 100644 --- a/products/cyanogen_hero.mk +++ b/products/cyanogen_hero.mk @@ -19,25 +19,14 @@ PRODUCT_BRAND := htc PRODUCT_DEVICE := hero PRODUCT_MODEL := Hero PRODUCT_MANUFACTURER := HTC -PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=GRH78 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=google/soju/crespo:2.3.1/GRH78/85442:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.1 GRH78 85442 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=GRH78 BUILD_FINGERPRINT=google/soju/crespo:2.3.1/GRH78/85442:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.1 GRH78 85442 release-keys" PRODUCT_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-hero.map -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Hero -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Hero - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Hero-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := Hero +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy passion specific prebuilt files diff --git a/products/cyanogen_heroc.mk b/products/cyanogen_heroc.mk index 867358d2..a79dda99 100644 --- a/products/cyanogen_heroc.mk +++ b/products/cyanogen_heroc.mk @@ -13,26 +13,16 @@ PRODUCT_BRAND := sprint PRODUCT_DEVICE := heroc PRODUCT_MODEL := HERO200 PRODUCT_MANUFACTURER := HTC -PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=GRI40 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=google/passion/passion:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.3 GRI40 102588 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=GRI40 BUILD_FINGERPRINT=google/passion/passion:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.3 GRI40 102588 release-keys" # Extra overlay for Gallery3D orientation hack PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/heroc PRODUCT_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-hero.map -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Heroc -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Heroc - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Heroc-KANG - endif -endif + +# Release name and versioning +PRODUCT_RELEASE_NAME := Heroc +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy dream/sapphire specific prebuilt files diff --git a/products/cyanogen_inc.mk b/products/cyanogen_inc.mk index 95acba74..e942af3b 100644 --- a/products/cyanogen_inc.mk +++ b/products/cyanogen_inc.mk @@ -11,7 +11,7 @@ PRODUCT_BRAND := htc PRODUCT_DEVICE := inc PRODUCT_MODEL := Incredible PRODUCT_MANUFACTURER := HTC -PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=GWK74 PRODUCT_NAME=inc BUILD_FINGERPRINT=verizon_wwe/inc/inc/inc:2.2/FRF91/264707:user/release-keys PRODUCT_BRAND=verizon_wwe TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=release-keys PRIVATE_BUILD_DESC="3.26.605.1 CL264707 release-keys" PRODUCT_MODEL=ADR6300 PRODUCT_MANUFACTURER=HTC +PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 PRODUCT_NAME=inc BUILD_FINGERPRINT=verizon_wwe/inc/inc/inc:2.2/FRF91/264707:user/release-keys PRODUCT_BRAND=verizon_wwe TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=release-keys PRIVATE_BUILD_DESC="3.26.605.1 CL264707 release-keys" PRODUCT_MODEL=ADR6300 PRODUCT_MANUFACTURER=HTC PRODUCT_PROPERTY_OVERRIDES += ro.product.version=3.26.605.1 @@ -24,21 +24,10 @@ PRODUCT_PACKAGES += Torch # Broadcom FM radio $(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk) -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Inc -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Inc - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Inc-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := Inc +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy passion specific prebuilt files diff --git a/products/cyanogen_jordan.mk b/products/cyanogen_jordan.mk index 50a7db61..65e6e453 100644 --- a/products/cyanogen_jordan.mk +++ b/products/cyanogen_jordan.mk @@ -18,28 +18,16 @@ PRODUCT_MANUFACTURER := motorola PRODUCT_SBF := 3.4.2-179-4 PRODUCT_SFX := JOREM_U3 -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%y%m%d-%H%M)-NIGHTLY-Jordan -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-jordan - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-jordan - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := Jordan +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk UTC_DATE := $(shell date +%s) DATE := $(shell date +%Y%m%d) PRODUCT_BUILD_PROP_OVERRIDES := \ BUILD_ID=GWK74 \ -BUILD_DISPLAY_ID="Gingerbread GWK74" \ PRODUCT_NAME=${PRODUCT_MODEL}_${PRODUCT_SFX} \ TARGET_DEVICE=umts_jordan \ BUILD_FINGERPRINT=MOTO/${PRODUCT_MODEL}_${PRODUCT_SFX}/umts_jordan/jordan:2.3.7/${PRODUCT_SBF}/${UTC_DATE}:user/release-keys \ diff --git a/products/cyanogen_legend.mk b/products/cyanogen_legend.mk index 700526b2..459121f6 100644 --- a/products/cyanogen_legend.mk +++ b/products/cyanogen_legend.mk @@ -13,7 +13,7 @@ PRODUCT_BRAND := htc PRODUCT_DEVICE := legend PRODUCT_MODEL := Legend PRODUCT_MANUFACTURER := HTC -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_legend BUILD_ID=GRH55 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=google/soju/crespo:2.3/GRH55/79397:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3 GRH55 79397 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_legend BUILD_ID=GRH55 BUILD_FINGERPRINT=google/soju/crespo:2.3/GRH55/79397:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3 GRH55 79397 release-keys" PRODUCT_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-msm722x.map @@ -24,18 +24,10 @@ $(call inherit-product, vendor/cyanogen/products/ti_fm_radio.mk) PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/legend -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Legend -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Legend - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Legend-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := Legend +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk PRODUCT_COPY_FILES += \ vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip diff --git a/products/cyanogen_leo.mk b/products/cyanogen_leo.mk index b824c9bb..726f6935 100644 --- a/products/cyanogen_leo.mk +++ b/products/cyanogen_leo.mk @@ -16,7 +16,7 @@ PRODUCT_BRAND := htc_wwe PRODUCT_DEVICE := leo PRODUCT_MODEL := HTC HD2 PRODUCT_MANUFACTURER := HTC -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=passion BUILD_ID=GRI40 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=google/passion/passion:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.3 GRI40 102588 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=passion BUILD_ID=GRI40 BUILD_FINGERPRINT=google/passion/passion:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.3 GRI40 102588 release-keys" # Extra leo overlay PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/leo @@ -37,23 +37,10 @@ PRODUCT_PACKAGES += Torch # Broadcom FM radio $(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk) - -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-LEO -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-LEO - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-LEO-KANG - endif -endif - +# Release name and versioning +PRODUCT_RELEASE_NAME := LEO +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy leo specific prebuilt files diff --git a/products/cyanogen_liberty.mk b/products/cyanogen_liberty.mk index 9f0e929a..ed3e136d 100644 --- a/products/cyanogen_liberty.mk +++ b/products/cyanogen_liberty.mk @@ -15,25 +15,17 @@ PRODUCT_BRAND := htc PRODUCT_DEVICE := liberty PRODUCT_MODEL := Liberty PRODUCT_MANUFACTURER := HTC -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_liberty BUILD_ID=GRK39F BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=google/passion/passion:2.3.6/GRK39F/189904:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.6 GRK39F 189904 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_liberty BUILD_ID=GRK39F BUILD_FINGERPRINT=google/passion/passion:2.3.6/GRK39F/189904:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.6 GRK39F 189904 release-keys" PRODUCT_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-msm722x.map # Broadcom FM radio $(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk) -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Liberty -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Liberty - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Liberty-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := Liberty +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy liberty specific prebuilt files diff --git a/products/cyanogen_mango.mk b/products/cyanogen_mango.mk index 7b1d2967..77a15338 100644 --- a/products/cyanogen_mango.mk +++ b/products/cyanogen_mango.mk @@ -15,7 +15,7 @@ PRODUCT_BRAND := SEMC PRODUCT_DEVICE := mango PRODUCT_MODEL := SK17i PRODUCT_MANUFACTURER := Sony Ericsson -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=SK17i BUILD_ID=4.0.A.2.368 BUILD_DISPLAY_ID=4.0.A.2.368 BUILD_FINGERPRINT=SEMC/SK17i_1249-8062/SK17i:2.3.3/4.0.A.2.368/j_b_3w:user/release-keys PRIVATE_BUILD_DESC="SK17i-user 2.3.3 4.0.A.2.368 j_b_3w test-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=SK17i BUILD_ID=4.0.A.2.368 BUILD_FINGERPRINT=SEMC/SK17i_1249-8062/SK17i:2.3.3/4.0.A.2.368/j_b_3w:user/release-keys PRIVATE_BUILD_DESC="SK17i-user 2.3.3 4.0.A.2.368 j_b_3w test-keys" # Build kernel #PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL= @@ -32,21 +32,10 @@ PRODUCT_PACKAGES += Torch # BCM FM radio #$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk) -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-XperiaMiniPro-SK17i -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-XperiaMiniPro-SK17i - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-XperiaMiniPro-SK17i-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := XperiaMiniPro-SK17i +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy passion specific prebuilt files diff --git a/products/cyanogen_mecha.mk b/products/cyanogen_mecha.mk index d161695a..efe19edd 100644 --- a/products/cyanogen_mecha.mk +++ b/products/cyanogen_mecha.mk @@ -12,7 +12,7 @@ PRODUCT_BRAND := verizon_wwe PRODUCT_DEVICE := mecha PRODUCT_MODEL := ADR6400L PRODUCT_MANUFACTURER := HTC -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_mecha BUILD_ID=FRG83D BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=verizon_wwe/htc_mecha/mecha/mecha:2.2.1/FRG83D/343953:user/release-keys PRIVATE_BUILD_DESC="1.70.605.0 CL343953 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_mecha BUILD_ID=FRG83D BUILD_FINGERPRINT=verizon_wwe/htc_mecha/mecha/mecha:2.2.1/FRG83D/343953:user/release-keys PRIVATE_BUILD_DESC="1.70.605.0 CL343953 release-keys" # Extra Mecha overlay PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/mecha @@ -26,21 +26,10 @@ $(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk) # SIM Toolkit PRODUCT_PACKAGES += Stk -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Thunderbolt -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Thunderbolt - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Thunderbolt-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := Thunderbolt +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy passion specific prebuilt files diff --git a/products/cyanogen_mesmerizemtd.mk b/products/cyanogen_mesmerizemtd.mk index 1c2ea062..c2040d9c 100644 --- a/products/cyanogen_mesmerizemtd.mk +++ b/products/cyanogen_mesmerizemtd.mk @@ -12,7 +12,7 @@ PRODUCT_BRAND := samsung PRODUCT_DEVICE := mesmerizemtd PRODUCT_MODEL := SCH-I500 PRODUCT_MANUFACTURER := samsung -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=soju BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=google/soju/crespo:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.4 GRJ22 121341 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=soju BUILD_ID=GRJ22 BUILD_FINGERPRINT=google/soju/crespo:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.4 GRJ22 121341 release-keys" # Extra mesmerizemtd overlay PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/mesmerizemtd @@ -20,21 +20,10 @@ PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/mesmerizemtd # Add the Torch app PRODUCT_PACKAGES += Torch -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Mesmerize -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Mesmerize - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Mesmerize-KANG-$(shell date +%m%d) - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := Mesmerize +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy galaxys specific prebuilt files diff --git a/products/cyanogen_mimmi.mk b/products/cyanogen_mimmi.mk index 1a38a70a..af011350 100644 --- a/products/cyanogen_mimmi.mk +++ b/products/cyanogen_mimmi.mk @@ -15,7 +15,7 @@ PRODUCT_BRAND := SEMC PRODUCT_DEVICE := mimmi PRODUCT_MODEL := U20i PRODUCT_MANUFACTURER := Sony Ericsson -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_DEVICE=U20i PRODUCT_NAME=U20i BUILD_ID=3.0.1.A.0.145 BUILD_DISPLAY_ID=3.0.1.A.0.145 BUILD_FINGERPRINT=SEMC/LT15i_1247-1073/LT15i:2.3.3/3.0.1.A.0.145/bn_p:user/release-keys PRIVATE_BUILD_DESC="LT15i-user 2.3.3 3.0.1.A.0.145 bn_P test-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_DEVICE=U20i PRODUCT_NAME=U20i BUILD_ID=3.0.1.A.0.145 BUILD_FINGERPRINT=SEMC/LT15i_1247-1073/LT15i:2.3.3/3.0.1.A.0.145/bn_p:user/release-keys PRIVATE_BUILD_DESC="LT15i-user 2.3.3 3.0.1.A.0.145 bn_P test-keys" # Add the Torch app PRODUCT_PACKAGES += Torch @@ -29,21 +29,10 @@ PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/ldpi # Ti FM radio #$(call inherit-product, vendor/cyanogen/products/ti_fm_radio.mk) -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-X10MiniPro -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-X10MiniPro - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-X10MiniPro-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := X10MiniPro +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy MDPI specific prebuilt files diff --git a/products/cyanogen_morrison.mk b/products/cyanogen_morrison.mk index 6ac3d53a..21679faf 100644 --- a/products/cyanogen_morrison.mk +++ b/products/cyanogen_morrison.mk @@ -17,23 +17,12 @@ PRODUCT_DEVICE := morrison PRODUCT_MODEL := MB200 PRODUCT_MANUFACTURER := Motorola -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-CLIQ -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-CLIQ - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-CLIQ-KANG - endif -endif - -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=morrison TARGET_DEVICE=morrison BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=google/soju/crespo:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.4 GRJ22 121341 release-keys" BUILD_NUMBER=121341 +# Release name and versioning +PRODUCT_RELEASE_NAME := CLIQ +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk + +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=morrison TARGET_DEVICE=morrison BUILD_ID=GRJ22 BUILD_FINGERPRINT=google/soju/crespo:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.4 GRJ22 121341 release-keys" BUILD_NUMBER=121341 PRODUCT_COPY_FILES += \ vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip diff --git a/products/cyanogen_motus.mk b/products/cyanogen_motus.mk index 66865d0a..36b3d457 100644 --- a/products/cyanogen_motus.mk +++ b/products/cyanogen_motus.mk @@ -15,23 +15,12 @@ PRODUCT_DEVICE := motus PRODUCT_MODEL := MB300 PRODUCT_MANUFACTURER := Motorola -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-BACKFLIP -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-BACKFLIP - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-BACKFLIP-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := BACKFLIP +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=motus_att_us TARGET_DEVICE=motus BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=google/soju/crespo:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.4 GRJ22 121341 release-keys" BUILD_NUMBER=121341 +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=motus_att_us TARGET_DEVICE=motus BUILD_ID=GRJ22 BUILD_FINGERPRINT=google/soju/crespo:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.4 GRJ22 121341 release-keys" BUILD_NUMBER=121341 PRODUCT_COPY_FILES += \ vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip diff --git a/products/cyanogen_olympus.mk b/products/cyanogen_olympus.mk index 32cfe300..333efe10 100644 --- a/products/cyanogen_olympus.mk +++ b/products/cyanogen_olympus.mk @@ -15,28 +15,16 @@ PRODUCT_BRAND := motorola PRODUCT_DEVICE := olympus PRODUCT_MODEL := MB860 PRODUCT_MANUFACTURER := Motorola -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_BRAND=MOTO PRODUCT_NAME=olyatt BUILD_ID=4.5.91 BUILD_PRODUCT=olyatt BUILD_DISPLAY_ID=4.5.91 BUILD_FINGERPRINT=MOTO/olyatt/olympus:2.3.4/4.5.91/110625:user/release-keys PRIVATE_BUILD_DESC="olympus-user 2.3.4 4.5.91 110625 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_BRAND=MOTO PRODUCT_NAME=olyatt BUILD_ID=4.5.91 BUILD_PRODUCT=olyatt BUILD_FINGERPRINT=MOTO/olyatt/olympus:2.3.4/4.5.91/110625:user/release-keys PRIVATE_BUILD_DESC="olympus-user 2.3.4 4.5.91 110625 release-keys" # Extra Olympus overlay PRODUCT_PACKAGE_OVERLAYS += \ vendor/cyanogen/overlay/olympus \ # vendor/cyanogen/overlay/qhd -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Olympus -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Olympus - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Olympus-KANG - endif -endif +PRODUCT_RELEASE_NAME := Olympus +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy hdpi specific prebuilt files diff --git a/products/cyanogen_one.mk b/products/cyanogen_one.mk index c945d111..fda23c96 100644 --- a/products/cyanogen_one.mk +++ b/products/cyanogen_one.mk @@ -15,7 +15,7 @@ PRODUCT_BRAND := geeksphone PRODUCT_DEVICE := one PRODUCT_MODEL := Geeksphone ONE PRODUCT_MANUFACTURER := Geeksphone -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_DEVICE=geeksphone-one PRODUCT_NAME=geeksphone_one BUILD_ID=GRI40 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=google/passion/passion:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.3 GRI40 102588 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_DEVICE=geeksphone-one PRODUCT_NAME=geeksphone_one BUILD_ID=GRI40 BUILD_FINGERPRINT=google/passion/passion:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.3 GRI40 102588 release-keys" # Add the CMWallpapers app PRODUCT_PACKAGES += CMWallpapers @@ -25,19 +25,10 @@ PRODUCT_PACKAGES += CMWallpapers # PRODUCT_PROPERTY_OVERRIDES += dalvik.vm.dexopt-data-only=1 - -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-ONE -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-ONE - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-ONE-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := ONE +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy GPO specific prebuilt files diff --git a/products/cyanogen_p990.mk b/products/cyanogen_p990.mk index 0d91eb69..e4d32c1d 100644 --- a/products/cyanogen_p990.mk +++ b/products/cyanogen_p990.mk @@ -15,26 +15,15 @@ PRODUCT_BRAND := lge PRODUCT_DEVICE := p990 PRODUCT_MODEL := Optimus 2X PRODUCT_MANUFACTURER := LGE -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=lge_star BUILD_ID=FRG83G BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=lge/lge_star/p990/p990:2.2.2/FRG83G/lgp990-V10b.2ED2ADCFFC:user/release-keys PRIVATE_BUILD_DESC="star-user 2.2.2 FRG83G 2ED2ADCFFC release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=lge_star BUILD_ID=FRG83G BUILD_FINGERPRINT=lge/lge_star/p990/p990:2.2.2/FRG83G/lgp990-V10b.2ED2ADCFFC:user/release-keys PRIVATE_BUILD_DESC="star-user 2.2.2 FRG83G 2ED2ADCFFC release-keys" # Extra Star overlay PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/star -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Optimus2X -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Optimus2X - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Optimus2X-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := Optimus2X +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy prebuilt files diff --git a/products/cyanogen_p999.mk b/products/cyanogen_p999.mk index 10a6e718..131237bf 100644 --- a/products/cyanogen_p999.mk +++ b/products/cyanogen_p999.mk @@ -15,7 +15,7 @@ PRODUCT_BRAND := lge PRODUCT_DEVICE := p999 PRODUCT_MODEL := LG-P999 PRODUCT_MANUFACTURER := lge -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=lge_lge_star BUILD_ID=GRI40 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=lge/lge_lge_star/p999:2.3.3/GRI40/lgp999-V21e.41fdc8a2:user/release-keys PRIVATE_BUILD_DESC="lge_star-user 2.3.3 GRI40 41fdc8a2 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=lge_lge_star BUILD_ID=GRI40 BUILD_FINGERPRINT=lge/lge_lge_star/p999:2.3.3/GRI40/lgp999-V21e.41fdc8a2:user/release-keys PRIVATE_BUILD_DESC="lge_star-user 2.3.3 GRI40 41fdc8a2 release-keys" # Build kernel #PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL= @@ -34,21 +34,10 @@ PRODUCT_PACKAGES += GanOptimizer # Broadcom FM radio #$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk) -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-G2x -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-G2x - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-G2x-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := G2x +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy hdpi specific prebuilt files diff --git a/products/cyanogen_passion.mk b/products/cyanogen_passion.mk index 9898f04e..4301e8cb 100644 --- a/products/cyanogen_passion.mk +++ b/products/cyanogen_passion.mk @@ -15,7 +15,7 @@ PRODUCT_BRAND := google PRODUCT_DEVICE := passion PRODUCT_MODEL := Nexus One PRODUCT_MANUFACTURER := HTC -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=passion BUILD_ID=GRK39F BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=google/passion/passion:2.3.6/GRK39F/189904:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.6 GRK39F 189904 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=passion BUILD_ID=GRK39F BUILD_FINGERPRINT=google/passion/passion:2.3.6/GRK39F/189904:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.6 GRK39F 189904 release-keys" # Build kernel PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL= @@ -37,21 +37,10 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.ril.oem.nosim.ecclist=911,112,999,000,08,118,120,122,110,119,995 \ ro.ril.emc.mode=2 -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-N1 -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-N1 - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-N1-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := N1 +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy passion specific prebuilt files diff --git a/products/cyanogen_robyn.mk b/products/cyanogen_robyn.mk index 03ac913d..9256c7b3 100644 --- a/products/cyanogen_robyn.mk +++ b/products/cyanogen_robyn.mk @@ -15,7 +15,7 @@ PRODUCT_BRAND := SEMC PRODUCT_DEVICE := robyn PRODUCT_MODEL := E10i PRODUCT_MANUFACTURER := Sony Ericsson -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_DEVICE=E10i PRODUCT_NAME=E10i BUILD_ID=3.0.1.A.0.145 BUILD_DISPLAY_ID=3.0.1.A.0.145 BUILD_FINGERPRINT=SEMC/LT15i_1247-1073/LT15i:2.3.3/3.0.1.A.0.145/bn_p:user/release-keys PRIVATE_BUILD_DESC="LT15i-user 2.3.3 3.0.1.A.0.145 bn_P test-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_DEVICE=E10i PRODUCT_NAME=E10i BUILD_ID=3.0.1.A.0.145 BUILD_FINGERPRINT=SEMC/LT15i_1247-1073/LT15i:2.3.3/3.0.1.A.0.145/bn_p:user/release-keys PRIVATE_BUILD_DESC="LT15i-user 2.3.3 3.0.1.A.0.145 bn_P test-keys" # Add the Torch app PRODUCT_PACKAGES += Torch @@ -29,21 +29,10 @@ PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/ldpi # Ti FM radio #$(call inherit-product, vendor/cyanogen/products/ti_fm_radio.mk) -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-X10Mini -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-X10Mini - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-X10Mini-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := X10mini +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy MDPI specific prebuilt files diff --git a/products/cyanogen_saga.mk b/products/cyanogen_saga.mk index 8d6c1e9b..3d213ffa 100644 --- a/products/cyanogen_saga.mk +++ b/products/cyanogen_saga.mk @@ -15,7 +15,7 @@ PRODUCT_BRAND := htc_europe PRODUCT_DEVICE := saga PRODUCT_MODEL := HTC Desire S PRODUCT_MANUFACTURER := HTC -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_saga BUILD_ID=GRJ90 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=htc_europe/htc_saga/saga:2.3.5/GRJ90/156318.4:user/release-keys PRIVATE_BUILD_DESC="2.10.401.4 CL156318 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_saga BUILD_ID=GRJ90 BUILD_FINGERPRINT=htc_europe/htc_saga/saga:2.3.5/GRJ90/156318.4:user/release-keys PRIVATE_BUILD_DESC="2.10.401.4 CL156318 release-keys" # Build kernel #PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL= @@ -31,21 +31,10 @@ PRODUCT_PACKAGES += Torch # Broadcom FM radio $(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk) -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-DesireS -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-DesireS - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-DesireS-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := DesireS +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy passion specific prebuilt files diff --git a/products/cyanogen_shadow.mk b/products/cyanogen_shadow.mk index 23c9246a..7960e282 100644 --- a/products/cyanogen_shadow.mk +++ b/products/cyanogen_shadow.mk @@ -13,23 +13,12 @@ PRODUCT_DEVICE := shadow PRODUCT_MODEL := DROIDX PRODUCT_MANUFACTURER := Motorola -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-DROIDX -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-RC0-DROIDX - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-RC0-DROIDX-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := DROIDX +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk -PRODUCT_BUILD_PROP_OVERRIDES := BUILD_ID=VZW BUILD_DISPLAY_ID=GRH78C PRODUCT_NAME=shadow_vzw TARGET_DEVICE=cdma_shadow BUILD_FINGERPRINT=verizon/shadow_vzw/cdma_shadow/shadow:2.2.1/VZW/23.340:user/ota-rel-keys,release-keys PRODUCT_BRAND=verizon PRIVATE_BUILD_DESC="cdma_shadow-user 2.2.1 VZW 2.3.340 ota-rel-keys,release-keys" BUILD_NUMBER=2.3.340 BUILD_UTC_DATE=1289194863 TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=release-keys USER=w30471 +PRODUCT_BUILD_PROP_OVERRIDES := BUILD_ID=VZW PRODUCT_NAME=shadow_vzw TARGET_DEVICE=cdma_shadow BUILD_FINGERPRINT=verizon/shadow_vzw/cdma_shadow/shadow:2.2.1/VZW/23.340:user/ota-rel-keys,release-keys PRODUCT_BRAND=verizon PRIVATE_BUILD_DESC="cdma_shadow-user 2.2.1 VZW 2.3.340 ota-rel-keys,release-keys" BUILD_NUMBER=2.3.340 BUILD_UTC_DATE=1289194863 TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=release-keys USER=w30471 PRODUCT_COPY_FILES += \ vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip diff --git a/products/cyanogen_shakira.mk b/products/cyanogen_shakira.mk index 4c5f05f2..5248dc72 100644 --- a/products/cyanogen_shakira.mk +++ b/products/cyanogen_shakira.mk @@ -15,7 +15,7 @@ PRODUCT_BRAND := SEMC PRODUCT_DEVICE := shakira PRODUCT_MODEL := E15i PRODUCT_MANUFACTURER := Sony Ericsson -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_DEVICE=E15i PRODUCT_NAME=E15i BUILD_ID=3.0.1.A.0.145 BUILD_DISPLAY_ID=3.0.1.A.0.145 BUILD_FINGERPRINT=SEMC/LT15i_1247-1073/LT15i:2.3.3/3.0.1.A.0.145/bn_p:user/release-keys PRIVATE_BUILD_DESC="LT15i-user 2.3.3 3.0.1.A.0.145 bn_P test-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_DEVICE=E15i PRODUCT_NAME=E15i BUILD_ID=3.0.1.A.0.145 BUILD_FINGERPRINT=SEMC/LT15i_1247-1073/LT15i:2.3.3/3.0.1.A.0.145/bn_p:user/release-keys PRIVATE_BUILD_DESC="LT15i-user 2.3.3 3.0.1.A.0.145 bn_P test-keys" # Extra shakira overlay PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/shakira @@ -23,21 +23,10 @@ PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/shakira # Ti FM radio (not implemeted in libaudio) #$(call inherit-product, vendor/cyanogen/products/ti_fm_radio.mk) -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-X8 -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-X8 - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-X8-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := X8 +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy MDPI specific prebuilt files diff --git a/products/cyanogen_sholes.mk b/products/cyanogen_sholes.mk index bca257e5..fb1121d6 100644 --- a/products/cyanogen_sholes.mk +++ b/products/cyanogen_sholes.mk @@ -13,23 +13,12 @@ PRODUCT_DEVICE := sholes PRODUCT_MODEL := Droid PRODUCT_MANUFACTURER := Motorola -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Droid -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Droid - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Droid-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := Droid +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk -PRODUCT_BUILD_PROP_OVERRIDES := BUILD_ID=FRG83G BUILD_DISPLAY_ID=GWK74 PRODUCT_NAME=voles TARGET_DEVICE=sholes BUILD_FINGERPRINT=verizon/voles/sholes/sholes:2.2.2/FRG83G/91102:user/release-keys PRODUCT_BRAND=verizon PRIVATE_BUILD_DESC="voles-user 2.2.2 FRG83G 91102 release-keys" BUILD_NUMBER=91102 BUILD_UTC_DATE=1294972140 TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=release-keys USER=android-build +PRODUCT_BUILD_PROP_OVERRIDES := BUILD_ID=FRG83G PRODUCT_NAME=voles TARGET_DEVICE=sholes BUILD_FINGERPRINT=verizon/voles/sholes/sholes:2.2.2/FRG83G/91102:user/release-keys PRODUCT_BRAND=verizon PRIVATE_BUILD_DESC="voles-user 2.2.2 FRG83G 91102 release-keys" BUILD_NUMBER=91102 BUILD_UTC_DATE=1294972140 TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=release-keys USER=android-build PRODUCT_COPY_FILES += \ vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip diff --git a/products/cyanogen_showcasemtd.mk b/products/cyanogen_showcasemtd.mk index 10c1100b..13aa43d1 100644 --- a/products/cyanogen_showcasemtd.mk +++ b/products/cyanogen_showcasemtd.mk @@ -12,7 +12,7 @@ PRODUCT_BRAND := samsung PRODUCT_DEVICE := showcasemtd PRODUCT_MODEL := SCH-I500 PRODUCT_MANUFACTURER := samsung -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=soju BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=google/soju/crespo:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.4 GRJ22 121341 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=soju BUILD_ID=GRJ22 BUILD_FINGERPRINT=google/soju/crespo:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.4 GRJ22 121341 release-keys" # Extra showcasemtd overlay PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/showcasemtd @@ -20,21 +20,10 @@ PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/showcasemtd # Add the Torch app PRODUCT_PACKAGES += Torch -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Showcase -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Showcase - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Showcase-KANG-$(shell date +%m%d) - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := Showcase +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy galaxys specific prebuilt files diff --git a/products/cyanogen_smb_a1002.mk b/products/cyanogen_smb_a1002.mk index 84c67c39..a5ef8bef 100644 --- a/products/cyanogen_smb_a1002.mk +++ b/products/cyanogen_smb_a1002.mk @@ -11,28 +11,17 @@ PRODUCT_BRAND := nvidia PRODUCT_DEVICE := smb_a1002 PRODUCT_MODEL := GTablet PRODUCT_MANUFACTURER := malata -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=smb_a1002 BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=smb_a1002 BUILD_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys" # Extra overlay PRODUCT_PACKAGE_OVERLAYS += \ vendor/cyanogen/overlay/tablet \ vendor/cyanogen/overlay/smb_a1002 -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-smb_a1002 -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-smb_a1002 - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-smb_a1002-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := smb_a1002 +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy passion specific prebuilt files diff --git a/products/cyanogen_smb_a1004.mk b/products/cyanogen_smb_a1004.mk index 8abc4448..3f4be7ac 100644 --- a/products/cyanogen_smb_a1004.mk +++ b/products/cyanogen_smb_a1004.mk @@ -11,28 +11,17 @@ PRODUCT_BRAND := malata PRODUCT_DEVICE := smb_a1004 PRODUCT_MODEL := SMB-A1004 PRODUCT_MANUFACTURER := malata -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=smb_a1004 BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=smb_a1004 BUILD_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys" # Extra overlay PRODUCT_PACKAGE_OVERLAYS += \ vendor/cyanogen/overlay/tablet \ vendor/cyanogen/overlay/smb_a1002 -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-SMB-A1004 -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-SMB-A1004 - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-SMB-A1004-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := SMB-A1004 +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy passion specific prebuilt files diff --git a/products/cyanogen_smb_a1011.mk b/products/cyanogen_smb_a1011.mk index bf7af02e..05a53f54 100644 --- a/products/cyanogen_smb_a1011.mk +++ b/products/cyanogen_smb_a1011.mk @@ -11,28 +11,17 @@ PRODUCT_BRAND := malata PRODUCT_DEVICE := smb_a1011 PRODUCT_MODEL := SMB-A1011 PRODUCT_MANUFACTURER := malata -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=smb_a1011 BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=smb_a1011 BUILD_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys" # Extra overlay PRODUCT_PACKAGE_OVERLAYS += \ vendor/cyanogen/overlay/tablet \ vendor/cyanogen/overlay/smb_a1002 -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-SMB-A1011 -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-SMB-A1011 - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-SMB-A1011-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := SMB-A1011 +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy passion specific prebuilt files diff --git a/products/cyanogen_smb_b9701.mk b/products/cyanogen_smb_b9701.mk index 298a02c4..4d451f90 100644 --- a/products/cyanogen_smb_b9701.mk +++ b/products/cyanogen_smb_b9701.mk @@ -11,28 +11,17 @@ PRODUCT_BRAND := nvidia PRODUCT_DEVICE := smb_b9701 PRODUCT_MODEL := Zpad-T8 PRODUCT_MANUFACTURER := malata -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=smb_b9701 BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=smb_b9701 BUILD_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys" # Extra overlay PRODUCT_PACKAGE_OVERLAYS += \ vendor/cyanogen/overlay/tablet \ vendor/cyanogen/overlay/smb_b9701 -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-smb_b9701 -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-smb_b9701 - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-smb_b9701-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := smb_b9701 +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy passion specific prebuilt files diff --git a/products/cyanogen_smultron.mk b/products/cyanogen_smultron.mk index 15c96895..631bc03b 100644 --- a/products/cyanogen_smultron.mk +++ b/products/cyanogen_smultron.mk @@ -15,7 +15,7 @@ PRODUCT_BRAND := SEMC PRODUCT_DEVICE := smultron PRODUCT_MODEL := ST15i PRODUCT_MANUFACTURER := Sony Ericsson -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=ST15i BUILD_ID=4.0.A.2.368 BUILD_DISPLAY_ID=4.0.A.2.368 BUILD_FINGERPRINT=SEMC/ST15i_1249-6227/ST15i:2.3.3/4.0.A.2.368/j_b_3w:user/release-keys PRIVATE_BUILD_DESC="ST15i-user 2.3.3 4.0.A.2.368 j_b_3w test-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=ST15i BUILD_ID=4.0.A.2.368 BUILD_FINGERPRINT=SEMC/ST15i_1249-6227/ST15i:2.3.3/4.0.A.2.368/j_b_3w:user/release-keys PRIVATE_BUILD_DESC="ST15i-user 2.3.3 4.0.A.2.368 j_b_3w test-keys" # Build kernel #PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL= @@ -32,21 +32,10 @@ PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/smultron # BCM FM radio #$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk) -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-XperiaMini-ST15i -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-XperiaMini-ST15i - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-XperiaMini-ST15i-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := XperiaMini-ST15i +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy passion specific prebuilt files diff --git a/products/cyanogen_speedy.mk b/products/cyanogen_speedy.mk index 338c4c32..7aa420cd 100644 --- a/products/cyanogen_speedy.mk +++ b/products/cyanogen_speedy.mk @@ -15,7 +15,7 @@ PRODUCT_BRAND := sprint PRODUCT_DEVICE := speedy PRODUCT_MODEL := PG06100 PRODUCT_MANUFACTURER := HTC -PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=GRI40 BUILD_DISPLAY_ID=GRI40 PRODUCT_NAME=htc_speedy BUILD_FINGERPRINT=sprint/htc_speedy/speedy:2.3.3/GRI40/74499:user/release-keys PRIVATE_BUILD_DESC="2.76.651.4 CL74499 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=GRI40 PRODUCT_NAME=htc_speedy BUILD_FINGERPRINT=sprint/htc_speedy/speedy:2.3.3/GRI40/74499:user/release-keys PRIVATE_BUILD_DESC="2.76.651.4 CL74499 release-keys" # Build kernel #PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL= @@ -31,21 +31,10 @@ PRODUCT_PACKAGES += Torch # Broadcom FM radio $(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk) -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Speedy -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Speedy - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Speedy-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := Speedy +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy passion specific prebuilt files diff --git a/products/cyanogen_supersonic.mk b/products/cyanogen_supersonic.mk index 75d5f976..53099ed4 100644 --- a/products/cyanogen_supersonic.mk +++ b/products/cyanogen_supersonic.mk @@ -15,7 +15,7 @@ PRODUCT_BRAND := sprint PRODUCT_DEVICE := supersonic PRODUCT_MODEL := PC36100 PRODUCT_MANUFACTURER := HTC -PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=GRI40 BUILD_DISPLAY_ID=GWK74 PRODUCT_NAME=htc_supersonic BUILD_FINGERPRINT=sprint/htc_supersonic/supersonic:2.3.3/GRI40/61076:user/release-keys PRIVATE_BUILD_DESC="4.24.651.1 CL61076 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=GRI40 PRODUCT_NAME=htc_supersonic BUILD_FINGERPRINT=sprint/htc_supersonic/supersonic:2.3.3/GRI40/61076:user/release-keys PRIVATE_BUILD_DESC="4.24.651.1 CL61076 release-keys" # Build kernel #PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL= @@ -31,21 +31,10 @@ PRODUCT_PACKAGES += Torch # Broadcom FM radio $(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk) -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Supersonic -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Supersonic - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Supersonic-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := Supersonic +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy passion specific prebuilt files diff --git a/products/cyanogen_u8220.mk b/products/cyanogen_u8220.mk index aa135b86..543bcba5 100644 --- a/products/cyanogen_u8220.mk +++ b/products/cyanogen_u8220.mk @@ -15,24 +15,12 @@ PRODUCT_BRAND := huawei PRODUCT_DEVICE := u8220 PRODUCT_MODEL := U8220/U8230 PRODUCT_MANUFACTURER := Huawei -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=u8220 BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys" - -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-U8220 -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-U8220 - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-U8220-KANG - endif -endif +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=u8220 BUILD_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys" +# Release name and versioning +PRODUCT_RELEASE_NAME := U8220 +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy DS specific prebuilt files diff --git a/products/cyanogen_urushi.mk b/products/cyanogen_urushi.mk index 6310cfa9..97218b7f 100644 --- a/products/cyanogen_urushi.mk +++ b/products/cyanogen_urushi.mk @@ -15,7 +15,7 @@ PRODUCT_BRAND := SEMC PRODUCT_DEVICE := urushi PRODUCT_MODEL := ST18i PRODUCT_MANUFACTURER := Sony Ericsson -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=ST18i BUILD_ID=4.0.A.2.368 BUILD_DISPLAY_ID=4.0.A.2.368 BUILD_FINGERPRINT=SEMC/ST18i_1247-1061/ST18i:2.3.3/3.0.1.A.0.145/bn_P:user/release-keys PRIVATE_BUILD_DESC="ST18i-user 2.3.3 3.0.1.A.0.145 bn_P test-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=ST18i BUILD_ID=4.0.A.2.368 BUILD_FINGERPRINT=SEMC/ST18i_1247-1061/ST18i:2.3.3/3.0.1.A.0.145/bn_P:user/release-keys PRIVATE_BUILD_DESC="ST18i-user 2.3.3 3.0.1.A.0.145 bn_P test-keys" # Build kernel #PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL= @@ -32,21 +32,10 @@ PRODUCT_PACKAGES += Torch # BCM FM radio #$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk) -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-XperiaRay-ST18i -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-XperiaRay-ST18i - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-XperiaRay-ST18i-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := XperiaRay-ST18i +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy passion specific prebuilt files diff --git a/products/cyanogen_v9.mk b/products/cyanogen_v9.mk index f6052d32..110439ea 100644 --- a/products/cyanogen_v9.mk +++ b/products/cyanogen_v9.mk @@ -15,23 +15,12 @@ PRODUCT_BRAND := zte PRODUCT_DEVICE := v9 PRODUCT_MODEL := V9 PRODUCT_MANUFACTURER := ZTE -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=v9 BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=v9 BUILD_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys" -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-V9 -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-V9 - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-V9-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := V9 +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy legend specific prebuilt files diff --git a/products/cyanogen_vega.mk b/products/cyanogen_vega.mk index 705d7507..bbfd3060 100644 --- a/products/cyanogen_vega.mk +++ b/products/cyanogen_vega.mk @@ -11,28 +11,17 @@ PRODUCT_BRAND := advent PRODUCT_DEVICE := vega PRODUCT_MODEL := Vega PRODUCT_MANUFACTURER := Advent -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=Vega BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys" BUILD_NUMBER=121341 +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=Vega BUILD_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys" BUILD_NUMBER=121341 # Extra overlay PRODUCT_PACKAGE_OVERLAYS += \ vendor/cyanogen/overlay/tablet \ vendor/cyanogen/overlay/vega -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Vega -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Vega - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Vega-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := Vega +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy Vega specific prebuilt files diff --git a/products/cyanogen_vibrantmtd.mk b/products/cyanogen_vibrantmtd.mk index 58b4cf16..99ba6f27 100644 --- a/products/cyanogen_vibrantmtd.mk +++ b/products/cyanogen_vibrantmtd.mk @@ -15,7 +15,7 @@ PRODUCT_BRAND := samsung PRODUCT_DEVICE := vibrantmtd PRODUCT_MODEL := SGH-T959 PRODUCT_MANUFACTURER := Samsung -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=soju BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=google/soju/crespo:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.4 GRJ22 121341 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=soju BUILD_ID=GRJ22 BUILD_FINGERPRINT=google/soju/crespo:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.4 GRJ22 121341 release-keys" # Build kernel #PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL= @@ -39,21 +39,10 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.additionalmounts=/mnt/emmc \ ro.vold.switchablepair=/mnt/sdcard,/mnt/emmc -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Vibrant -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Vibrant - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Vibrant-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := Vibrant +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy galaxys specific prebuilt files diff --git a/products/cyanogen_vision.mk b/products/cyanogen_vision.mk index e89533ea..14527c87 100644 --- a/products/cyanogen_vision.mk +++ b/products/cyanogen_vision.mk @@ -15,7 +15,7 @@ PRODUCT_BRAND := htc_wwe PRODUCT_DEVICE := vision PRODUCT_MODEL := HTC Vision PRODUCT_MANUFACTURER := HTC -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_vision BUILD_ID=GRI40 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=htc_wwe/htc_vision/vision:2.3.3/GRI40/84109:user/release-keys PRIVATE_BUILD_DESC="2.42.405.2 CL84109 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_vision BUILD_ID=GRI40 BUILD_FINGERPRINT=htc_wwe/htc_vision/vision:2.3.3/GRI40/84109:user/release-keys PRIVATE_BUILD_DESC="2.42.405.2 CL84109 release-keys" PRODUCT_SPECIFIC_DEFINES = WEBCORE_ACCELERATED_SCROLLING=true @@ -36,21 +36,10 @@ PRODUCT_PACKAGES += GanOptimizer # Broadcom FM radio $(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk) -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-vision -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-vision - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-vision-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := vision +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy passion specific prebuilt files diff --git a/products/cyanogen_vivo.mk b/products/cyanogen_vivo.mk index 8ef7f38c..cfabd406 100644 --- a/products/cyanogen_vivo.mk +++ b/products/cyanogen_vivo.mk @@ -15,7 +15,7 @@ PRODUCT_BRAND := htc_wwe PRODUCT_DEVICE := vivo PRODUCT_MODEL := Incredible S PRODUCT_MANUFACTURER := HTC -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_vivo BUILD_ID=GRI40 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=htc_wwe/htc_vivo/vivo:2.3.3/GRI40/88716:user/release-keys PRIVATE_BUILD_DESC="2.30.405.1 CL88716 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_vivo BUILD_ID=GRI40 BUILD_FINGERPRINT=htc_wwe/htc_vivo/vivo:2.3.3/GRI40/88716:user/release-keys PRIVATE_BUILD_DESC="2.30.405.1 CL88716 release-keys" # Build kernel #PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL= @@ -31,21 +31,10 @@ PRODUCT_PACKAGES += Torch # Broadcom FM radio $(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk) -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-IncS -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-IncS - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-IncS-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := IncS +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy passion specific prebuilt files diff --git a/products/cyanogen_vivow.mk b/products/cyanogen_vivow.mk index a1f8e036..60ffd080 100644 --- a/products/cyanogen_vivow.mk +++ b/products/cyanogen_vivow.mk @@ -12,7 +12,7 @@ PRODUCT_BRAND := verizon_wwe PRODUCT_DEVICE := vivow PRODUCT_MODEL := Incredible 2 PRODUCT_MANUFACTURER := HTC -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_vivow BUILD_ID=GRI40 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=verizon_wwe/htc_vivow/vivow:2.3.3/GRI40/81006:user/release-keys PRIVATE_BUILD_DESC="2.18.605.4 CL81006 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_vivow BUILD_ID=GRI40 BUILD_FINGERPRINT=verizon_wwe/htc_vivow/vivow:2.3.3/GRI40/81006:user/release-keys PRIVATE_BUILD_DESC="2.18.605.4 CL81006 release-keys" # Build kernel #PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL= @@ -28,21 +28,10 @@ PRODUCT_PACKAGES += Torch # Broadcom FM radio $(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk) -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Inc2 -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Inc2 - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Inc2-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := Inc2 +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy passion specific prebuilt files diff --git a/products/cyanogen_z71.mk b/products/cyanogen_z71.mk index 3d3f30bb..cad37de9 100644 --- a/products/cyanogen_z71.mk +++ b/products/cyanogen_z71.mk @@ -15,25 +15,14 @@ PRODUCT_BRAND := commtiva PRODUCT_DEVICE := z71 PRODUCT_MODEL := Z71 PRODUCT_MANUFACTURER := Commtiva -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=commtiva_z71 BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=commtiva_z71 BUILD_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys" #PRODUCT_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-z71.map -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Z71 -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Z71 - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-Z71-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := Z71 +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy legend specific prebuilt files diff --git a/products/cyanogen_zeppelin.mk b/products/cyanogen_zeppelin.mk index 474b3924..8188bf16 100644 --- a/products/cyanogen_zeppelin.mk +++ b/products/cyanogen_zeppelin.mk @@ -17,23 +17,12 @@ PRODUCT_DEVICE := zeppelin PRODUCT_MODEL := MB501 PRODUCT_MANUFACTURER := Motorola -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-CLIQXT -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-CLIQXT - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-CLIQXT-KANG - endif -endif - -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=zeppelin TARGET_DEVICE=zeppelin BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=google/soju/crespo:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.4 GRJ22 121341 release-keys" BUILD_NUMBER=121341 +# Release name and versioning +PRODUCT_RELEASE_NAME := CLIQXT +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk + +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=zeppelin TARGET_DEVICE=zeppelin BUILD_ID=GRJ22 BUILD_FINGERPRINT=google/soju/crespo:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.4 GRJ22 121341 release-keys" BUILD_NUMBER=121341 PRODUCT_COPY_FILES += \ vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip diff --git a/products/cyanogen_zero.mk b/products/cyanogen_zero.mk index 276ff5d3..5b40a6a5 100644 --- a/products/cyanogen_zero.mk +++ b/products/cyanogen_zero.mk @@ -16,23 +16,12 @@ PRODUCT_DEVICE := zero PRODUCT_MODEL := Geeksphone ZERO PRODUCT_MANUFACTURER := Geeksphone -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=geeksphone_zero BUILD_ID=FRG83 BUILD_DISPLAY_ID=GWK74 BUILD_FINGERPRINT=qcom/msm7627_ffa/msm7627_ffa/7x27:2.2.1/FRG83/eng.SIMCOM.20110314.124514:user/test-keys PRIVATE_BUILD_DESC="msm7627_ffa-user 2.2.1 FRG83 eng.SIMCOM.20110314.124514 test-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=geeksphone_zero BUILD_ID=FRG83 BUILD_FINGERPRINT=qcom/msm7627_ffa/msm7627_ffa/7x27:2.2.1/FRG83/eng.SIMCOM.20110314.124514:user/test-keys PRIVATE_BUILD_DESC="msm7627_ffa-user 2.2.1 FRG83 eng.SIMCOM.20110314.124514 test-keys" -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-ZERO -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-ZERO - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-ZERO-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := ZERO +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy legend specific prebuilt files diff --git a/products/cyanogen_zeus.mk b/products/cyanogen_zeus.mk index dc3ffb4a..fcf09cc5 100644 --- a/products/cyanogen_zeus.mk +++ b/products/cyanogen_zeus.mk @@ -15,7 +15,7 @@ PRODUCT_BRAND := SEMC PRODUCT_DEVICE := zeus PRODUCT_MODEL := R800i PRODUCT_MANUFACTURER := Sony Ericsson -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=Play BUILD_ID=3.0.1.A.0.145 BUILD_DISPLAY_ID=3.0.1.A.0.145 BUILD_FINGERPRINT=SEMC/R800i_1247-6199/R800i:2.3.3/3.0.1.A.0.145/bn_p:user/release-keys PRIVATE_BUILD_DESC="LT15i-user 2.3.3 3.0.1.A.0.145 bn_P test-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=Play BUILD_ID=3.0.1.A.0.145 BUILD_FINGERPRINT=SEMC/R800i_1247-6199/R800i:2.3.3/3.0.1.A.0.145/bn_p:user/release-keys PRIVATE_BUILD_DESC="LT15i-user 2.3.3 3.0.1.A.0.145 bn_P test-keys" # Build kernel #PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL= @@ -32,21 +32,10 @@ PRODUCT_PACKAGES += Torch # BCM FM radio #$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk) -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-XperiaPlay-R800i -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-XperiaPlay-R800i - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-XperiaPlay-R800i-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := XperiaPlay-R800i +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy passion specific prebuilt files diff --git a/products/cyanogen_zeusc.mk b/products/cyanogen_zeusc.mk index ff4137f2..cb0b53b3 100644 --- a/products/cyanogen_zeusc.mk +++ b/products/cyanogen_zeusc.mk @@ -13,7 +13,7 @@ PRODUCT_BRAND := SEMC PRODUCT_DEVICE := zeus PRODUCT_MODEL := R800x PRODUCT_MANUFACTURER := Sony Ericsson -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=Play BUILD_ID=3.0.1.A.0.145 BUILD_DISPLAY_ID=3.0.1.A.0.145 BUILD_FINGERPRINT=SEMC/R800i_1247-6199/R800i:2.3.3/3.0.1.A.0.145/bn_p:user/release-keys PRIVATE_BUILD_DESC="LT15i-user 2.3.3 3.0.1.A.0.145 bn_P test-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=Play BUILD_ID=3.0.1.A.0.145 BUILD_FINGERPRINT=SEMC/R800i_1247-6199/R800i:2.3.3/3.0.1.A.0.145/bn_p:user/release-keys PRIVATE_BUILD_DESC="LT15i-user 2.3.3 3.0.1.A.0.145 bn_P test-keys" # Build kernel #PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL= @@ -30,21 +30,10 @@ PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/zeus # BCM FM radio #$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk) -# -# Set ro.modversion -# -ifdef CYANOGEN_NIGHTLY - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-XperiaPlay-R800x -else - ifdef CYANOGEN_RELEASE - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-XperiaPlay-R800x - else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.1.0-XperiaPlay-R800x-KANG - endif -endif +# Release name and versioning +PRODUCT_RELEASE_NAME := XperiaPlayCDMA-R800x +PRODUCT_VERSION_DEVICE_SPECIFIC := +-include vendor/cyanogen/products/common_versions.mk # # Copy passion specific prebuilt files