diff --git a/products/cyanogen_ace.mk b/products/cyanogen_ace.mk index feca72e9..ff5506ab 100644 --- a/products/cyanogen_ace.mk +++ b/products/cyanogen_ace.mk @@ -35,8 +35,13 @@ ifdef CYANOGEN_NIGHTLY PRODUCT_PROPERTY_OVERRIDES += \ ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-DesireHD else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.0.0-RC0-DesireHD + ifdef CYANOGEN_RELEASE + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-DesireHD + else + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-DesireHD-KANG + endif endif # diff --git a/products/cyanogen_bravo.mk b/products/cyanogen_bravo.mk index 589e72d9..ce8e88e8 100644 --- a/products/cyanogen_bravo.mk +++ b/products/cyanogen_bravo.mk @@ -41,8 +41,13 @@ ifdef CYANOGEN_NIGHTLY PRODUCT_PROPERTY_OVERRIDES += \ ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Desire else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.0.0-RC0-Desire + ifdef CYANOGEN_RELEASE + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-Desire + else + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-Desire-KANG + endif endif # diff --git a/products/cyanogen_bravoc.mk b/products/cyanogen_bravoc.mk index 0391406f..b85a674b 100644 --- a/products/cyanogen_bravoc.mk +++ b/products/cyanogen_bravoc.mk @@ -32,8 +32,13 @@ ifdef CYANOGEN_NIGHTLY PRODUCT_PROPERTY_OVERRIDES += \ ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-BravoC else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.0.0-RC0-BravoC + ifdef CYANOGEN_RELEASE + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-BravoC + else + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-BravoC-KANG + endif endif # diff --git a/products/cyanogen_buzz.mk b/products/cyanogen_buzz.mk index d98e50ac..5c321afa 100644 --- a/products/cyanogen_buzz.mk +++ b/products/cyanogen_buzz.mk @@ -42,6 +42,11 @@ ifdef CYANOGEN_NIGHTLY PRODUCT_PROPERTY_OVERRIDES += \ ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-buzz else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.0.0-RC0-buzz + ifdef CYANOGEN_RELEASE + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-buzz + else + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-buzz-KANG + endif endif diff --git a/products/cyanogen_crespo.mk b/products/cyanogen_crespo.mk index 0046555b..8d4e2180 100644 --- a/products/cyanogen_crespo.mk +++ b/products/cyanogen_crespo.mk @@ -36,8 +36,13 @@ ifdef CYANOGEN_NIGHTLY PRODUCT_PROPERTY_OVERRIDES += \ ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-NS else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.0.0-Alpha2-NS + ifdef CYANOGEN_RELEASE + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-ALPHA2-NS + else + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-ALPHA2-NS-KANG + endif endif # diff --git a/products/cyanogen_dream_sapphire.mk b/products/cyanogen_dream_sapphire.mk index fd0db922..7a1c5451 100644 --- a/products/cyanogen_dream_sapphire.mk +++ b/products/cyanogen_dream_sapphire.mk @@ -40,8 +40,13 @@ ifdef CYANOGEN_NIGHTLY PRODUCT_PROPERTY_OVERRIDES += \ ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-DS else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.0.0-RC0-DS + ifdef CYANOGEN_RELEASE + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-DS + else + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-DS-KANG + endif endif # Use the audio profile hack diff --git a/products/cyanogen_espresso.mk b/products/cyanogen_espresso.mk index b10bdd89..dbf3b807 100644 --- a/products/cyanogen_espresso.mk +++ b/products/cyanogen_espresso.mk @@ -29,8 +29,13 @@ ifdef CYANOGEN_NIGHTLY PRODUCT_PROPERTY_OVERRIDES += \ ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Slide else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.0.0-RC0-Slide + ifdef CYANOGEN_RELEASE + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-Slide + else + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-Slide-KANG + endif endif # diff --git a/products/cyanogen_glacier.mk b/products/cyanogen_glacier.mk index 3fbed429..548e3049 100644 --- a/products/cyanogen_glacier.mk +++ b/products/cyanogen_glacier.mk @@ -32,8 +32,13 @@ ifdef CYANOGEN_NIGHTLY PRODUCT_PROPERTY_OVERRIDES += \ ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-glacier else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.0.0-RC0-glacier + ifdef CYANOGEN_RELEASE + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-glacier + else + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-glacier-KANG + endif endif # diff --git a/products/cyanogen_harmony.mk b/products/cyanogen_harmony.mk index 56ca8994..29c35085 100644 --- a/products/cyanogen_harmony.mk +++ b/products/cyanogen_harmony.mk @@ -23,8 +23,13 @@ ifdef CYANOGEN_NIGHTLY PRODUCT_PROPERTY_OVERRIDES += \ ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Harmony else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.0.0-RC0-Harmony + ifdef CYANOGEN_RELEASE + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-Harmony + else + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-Harmony-KANG + endif endif # diff --git a/products/cyanogen_hero.mk b/products/cyanogen_hero.mk index 3585496e..3c64c778 100644 --- a/products/cyanogen_hero.mk +++ b/products/cyanogen_hero.mk @@ -29,8 +29,13 @@ ifdef CYANOGEN_NIGHTLY PRODUCT_PROPERTY_OVERRIDES += \ ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Hero else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.0.0-RC0-Hero + ifdef CYANOGEN_RELEASE + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-Hero + else + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-Hero-KANG + endif endif # diff --git a/products/cyanogen_heroc.mk b/products/cyanogen_heroc.mk index ba9afefa..6b92c61f 100644 --- a/products/cyanogen_heroc.mk +++ b/products/cyanogen_heroc.mk @@ -25,8 +25,13 @@ ifdef CYANOGEN_NIGHTLY PRODUCT_PROPERTY_OVERRIDES += \ ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Heroc else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.0.0-RC0-Heroc + ifdef CYANOGEN_RELEASE + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-Heroc + else + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-Heroc-KANG + endif endif # diff --git a/products/cyanogen_inc.mk b/products/cyanogen_inc.mk index 04b67e10..88062943 100644 --- a/products/cyanogen_inc.mk +++ b/products/cyanogen_inc.mk @@ -25,8 +25,13 @@ ifdef CYANOGEN_NIGHTLY PRODUCT_PROPERTY_OVERRIDES += \ ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Inc else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.0.0-RC0-Inc + ifdef CYANOGEN_RELEASE + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-Inc + else + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-Inc-KANG + endif endif # diff --git a/products/cyanogen_legend.mk b/products/cyanogen_legend.mk index 754ea832..fba68a95 100644 --- a/products/cyanogen_legend.mk +++ b/products/cyanogen_legend.mk @@ -26,8 +26,13 @@ ifdef CYANOGEN_NIGHTLY PRODUCT_PROPERTY_OVERRIDES += \ ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Legend else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.0.0-RC0-Legend + ifdef CYANOGEN_RELEASE + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-Legend + else + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-Legend-KANG + endif endif # diff --git a/products/cyanogen_liberty.mk b/products/cyanogen_liberty.mk index 359ebb0a..96a538e8 100644 --- a/products/cyanogen_liberty.mk +++ b/products/cyanogen_liberty.mk @@ -24,8 +24,13 @@ ifdef CYANOGEN_NIGHTLY PRODUCT_PROPERTY_OVERRIDES += \ ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Liberty else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.0.0-RC0-Liberty + ifdef CYANOGEN_RELEASE + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-Liberty + else + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-Liberty-KANG + endif endif # diff --git a/products/cyanogen_one.mk b/products/cyanogen_one.mk index 299522e3..702cd908 100644 --- a/products/cyanogen_one.mk +++ b/products/cyanogen_one.mk @@ -27,8 +27,13 @@ ifdef CYANOGEN_NIGHTLY PRODUCT_PROPERTY_OVERRIDES += \ ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-ONE else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.0.0-RC0-ONE + ifdef CYANOGEN_RELEASE + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-ONE + else + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-ONE-KANG + endif endif # diff --git a/products/cyanogen_passion.mk b/products/cyanogen_passion.mk index 4c0a60ff..ff002088 100644 --- a/products/cyanogen_passion.mk +++ b/products/cyanogen_passion.mk @@ -41,8 +41,13 @@ ifdef CYANOGEN_NIGHTLY PRODUCT_PROPERTY_OVERRIDES += \ ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-N1 else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.0.0-RC0-N1 + ifdef CYANOGEN_RELEASE + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-N1 + else + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-N1-KANG + endif endif # diff --git a/products/cyanogen_sholes.mk b/products/cyanogen_sholes.mk index b840bf93..cee94422 100644 --- a/products/cyanogen_sholes.mk +++ b/products/cyanogen_sholes.mk @@ -20,8 +20,13 @@ ifdef CYANOGEN_NIGHTLY PRODUCT_PROPERTY_OVERRIDES += \ ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Droid else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.0.0-RC0-Droid + ifdef CYANOGEN_RELEASE + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-Droid + else + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-Droid-KANG + endif endif PRODUCT_BUILD_PROP_OVERRIDES := BUILD_ID=FRG83D BUILD_DISPLAY_ID=GRH78 PRODUCT_NAME=voles TARGET_DEVICE=sholes BUILD_FINGERPRINT=verizon/voles/sholes/sholes:2.2.1/FRG83D/75603:user/release-keys PRODUCT_BRAND=verizon PRIVATE_BUILD_DESC="voles-user 2.2.1 FRG83D 75603 release-keys" BUILD_NUMBER=75603 BUILD_UTC_DATE=1289367602 TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=release-keys USER=android-build diff --git a/products/cyanogen_supersonic.mk b/products/cyanogen_supersonic.mk index 5a5232e4..c336d193 100644 --- a/products/cyanogen_supersonic.mk +++ b/products/cyanogen_supersonic.mk @@ -32,8 +32,13 @@ ifdef CYANOGEN_NIGHTLY PRODUCT_PROPERTY_OVERRIDES += \ ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Supersonic else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.0.0-RC0-Supersonic + ifdef CYANOGEN_RELEASE + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-Supersonic + else + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-Supersonic-KANG + endif endif # diff --git a/products/cyanogen_vision.mk b/products/cyanogen_vision.mk index 3a6578b5..ce556d12 100644 --- a/products/cyanogen_vision.mk +++ b/products/cyanogen_vision.mk @@ -35,8 +35,13 @@ ifdef CYANOGEN_NIGHTLY PRODUCT_PROPERTY_OVERRIDES += \ ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-vision else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.0.0-RC0-vision + ifdef CYANOGEN_RELEASE + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-vision + else + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-vision-KANG + endif endif # diff --git a/products/cyanogen_z71.mk b/products/cyanogen_z71.mk index c2afd299..21a58727 100644 --- a/products/cyanogen_z71.mk +++ b/products/cyanogen_z71.mk @@ -26,8 +26,13 @@ ifdef CYANOGEN_NIGHTLY PRODUCT_PROPERTY_OVERRIDES += \ ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Z71 else - PRODUCT_PROPERTY_OVERRIDES += \ - ro.modversion=CyanogenMod-7.0.0-RC0-Z71 + ifdef CYANOGEN_RELEASE + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-Z71 + else + PRODUCT_PROPERTY_OVERRIDES += \ + ro.modversion=CyanogenMod-7.0.0-RC0-Z71-KANG + endif endif #