Merge "Updated harmony build values to OTA values" into froyo
diff --git a/products/cyanogen_bravo.mk b/products/cyanogen_bravo.mk
index ef535df..62f6b2c 100644
--- a/products/cyanogen_bravo.mk
+++ b/products/cyanogen_bravo.mk
@@ -47,7 +47,7 @@
ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Desire
else
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-6.1.0-RC1-Desire
+ ro.modversion=CyanogenMod-6.1.0-RC2-Desire
endif
#
diff --git a/products/cyanogen_bravoc.mk b/products/cyanogen_bravoc.mk
index 5acdb64..97d5fc6 100644
--- a/products/cyanogen_bravoc.mk
+++ b/products/cyanogen_bravoc.mk
@@ -36,7 +36,7 @@
ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-BravoC
else
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-6.1.0-RC1-BravoC
+ ro.modversion=CyanogenMod-6.1.0-RC2-BravoC
endif
#
diff --git a/products/cyanogen_dream_sapphire.mk b/products/cyanogen_dream_sapphire.mk
index 8eb7456..598ba76 100644
--- a/products/cyanogen_dream_sapphire.mk
+++ b/products/cyanogen_dream_sapphire.mk
@@ -41,7 +41,7 @@
ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-DS
else
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-6.1.0-RC1-DS
+ ro.modversion=CyanogenMod-6.1.0-RC2-DS
endif
# Use the audio profile hack
diff --git a/products/cyanogen_espresso.mk b/products/cyanogen_espresso.mk
index e50d54a..f5ed41d 100644
--- a/products/cyanogen_espresso.mk
+++ b/products/cyanogen_espresso.mk
@@ -33,7 +33,7 @@
ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Slide
else
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-6.1.0-RC2-Slide
+ ro.modversion=CyanogenMod-6.1.0-RC3-Slide
endif
#
diff --git a/products/cyanogen_passion.mk b/products/cyanogen_passion.mk
index c90a63f..0738bb5 100644
--- a/products/cyanogen_passion.mk
+++ b/products/cyanogen_passion.mk
@@ -44,7 +44,7 @@
ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-N1
else
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-6.1.0-RC1-N1
+ ro.modversion=CyanogenMod-6.1.0-RC2-N1
endif
#
diff --git a/products/cyanogen_supersonic.mk b/products/cyanogen_supersonic.mk
index 47cc9c8..8c33950 100644
--- a/products/cyanogen_supersonic.mk
+++ b/products/cyanogen_supersonic.mk
@@ -14,6 +14,11 @@
PRODUCT_MANUFACTURER := HTC
PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=FRG83 PRODUCT_NAME=htc_supersonic BUILD_FINGERPRINT=sprint/htc_supersonic/supersonic/supersonic:2.2/FRF91/252548:user/release-keys PRIVATE_BUILD_DESC="3.29.651.5 CL252548 release-keys"
+# Build kernel
+PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
+PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
+PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_supersonic_defconfig
+
# Extra Supersonic overlay
PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/supersonic
@@ -30,7 +35,7 @@
ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Supersonic
else
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-6.1.0-RC1-Supersonic
+ ro.modversion=CyanogenMod-6.1.0-RC2-Supersonic
endif
#
diff --git a/products/cyanogen_vision.mk b/products/cyanogen_vision.mk
index f1e9ca1..e90542e 100644
--- a/products/cyanogen_vision.mk
+++ b/products/cyanogen_vision.mk
@@ -36,7 +36,7 @@
ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-vision
else
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-6.1.0-RC2-vision
+ ro.modversion=CyanogenMod-6.1.0-RC3-vision
endif
#