Merge branch 'froyo' of http://github.com/Kali-/android_vendor_cyanogen into froyo

products/cyanogen_bravo.mk

@@ -13,26 +13,35 @@ $(call inherit-product, vendor/cyanogen/products/gsm.mk)
 PRODUCT_NAME := cyanogen_bravo
 PRODUCT_BRAND := htc_wwe
 PRODUCT_DEVICE := bravo
-PRODUCT_MODEL := HTC Desire
+PRODUCT_MODEL := Desire
 PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF85B BUILD_DISPLAY_ID=FRF85B PRODUCT_NAME=passion BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2/FRF85B/42745:user/release-keys TARGET_BUILD_TYPE=userdebug
-PRIVATE_BUILD_DESC="passion-user 2.2 FRF85B 42745 release-keys"
-
-# Build Kernel
-PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=device/htc/bravo-common/kernel
+PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=FRF91 PRODUCT_NAME=passion BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2/FRF91/43546:user/release-keys TARGET_BUILD_TYPE=userdebug BUILD_VERSION_TAGS=release-keys
+PRIVATE_BUILD_DESC="passion-user 2.2 FRF91 43546 release-keys"
 
 # Extra Passion overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/passion
 
+# Use a precompiled kernel until the merge with cm-kernel
+TARGET_PREBUILT_KERNEL = device/htc/bravo-common/kernel
+
+# Extra RIL settings
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.ril.enable.managed.roaming=1 \
+    ro.ril.oem.nosim.ecclist=911,112,999,000,08,118,120,122,110,119,995 \
+    ro.ril.emc.mode=2
+
+# Enable Windows Media
+WITH_WINDOWS_MEDIA := true
+
 #
 # Set ro.modversion
 #
 ifdef CYANOGEN_NIGHTLY
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Bravo
+        ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Desire
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.0.0-Bravo-test0
+        ro.modversion=CyanogenMod-6.0.0-Desire-alpha2
 endif
 
 #
@@ -43,4 +52,4 @@ PRODUCT_COPY_FILES +=  \
 
 ifndef DEFAULT_LAUNCHER
     PRODUCT_PACKAGES += ADWLauncher
-endif
+endif