Merge "Don't inherit FM app, as it doesn't work properly with the Defy audio stack." into gingerbread
diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index 1926df1..8dcfa87 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -32,7 +32,7 @@
* Harmony (Malata smb_a1004/smb_a1011): arcee
* Ace (Desire HD/Inspire 4G): Kali-, jznomoney, attn1
* Glacier (MT4G): Zinx, Kmobs, cyanogen
-* Click (Tattoo): KalimochoAz
+* Click (Tattoo): KalimochoAz, Arne Coucheron
* Blade (San Francisco, Sapo A5, others): Tom Giordano and Jacob Crawley
* Encore (Nook Color): dalingrin, cvpcs, nemith, cicada, fattire
* Speedy: toastcfh
@@ -50,6 +50,7 @@
* Xperia Arc (LT15i): Bin4ry,defer,jerpelea (FreeXperia team)
* Xperia Neo (MT15i): Bin4ry,defer,jerpelea (FreeXperia team)
* Xperia Play (R800i): Bin4ry,defer,jerpelea (FreeXperia team)
+* Droid2we (Droid2 Global): RevNumbers, x13thangelx
Translators:
------------
@@ -107,6 +108,7 @@
* Common: Bluetooth tethering - Stéphane Konstantaropoulos
* Click, Motorola: Speed up photo recording - Emilio López
* Click, Motorola: Add Geolocation to photo app - KalimochoAz
+* Click: Upgraded kernel from HTC 2.6.29 to 2.6.35
* Vision/Glacier/Ace/Speedy/Vivo/Vivow: 2.6.35 kernel and updated userspace
* Buzz: 2.6.35 kernel - Arne Coucheron
* Bravo(c)/Vivo(w)/Ace/Liberty: On charge notification led - Richard Antony Burton
diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index 3be0dd9..00965f5 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -583,6 +583,8 @@
<apn carrier="MMS" mcc="311" mnc="190" apn="wap.cellular1.net" mmsc="http://mms.cellular1.net/ecit/mms.php" type="mms" />
<apn carrier="Farmers" mcc="311" mnc="210" apn="internet.farmerswireless.com" type="default,supl" />
<apn carrier="Farmers MMS" mcc="311" mnc="210" apn="mms.farmers.com" mmsc="172.16.0.37:8514" type="mms" />
+ <apn carrier="GCI Data" mcc="311" mnc="370" apn="web.gci" type="default,supl" />
+ <apn carrier="GCI MMS" mcc="311" mnc="370" apn="mms.gci" mmsproxy="209.4.229.92" mmsport="9201" mmsc="http://mmsc.gci.csky.us:6672" type="mms" />
<apn carrier="Claro PR" mcc="330" mnc="11" apn="internet.claropr.com" port="8080" type="default,supl" />
<apn carrier="Claro PR MMS" mcc="330" mnc="11" apn="mms.claropr.com" mmsc="http://mmsg.claropr.com:1021/mmsc" mmsproxy="10.50.38.3" mmsport="8799" type="mms" />
<apn carrier="Telcel EDGE" mcc="334" mnc="020" apn="internet.itelcel.com" user="webgprs" password="webgprs2002" type="default,supl" />
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 92f9d48..3a927db 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -12,6 +12,7 @@
$(LOCAL_DIR)/cyanogen_desirec.mk \
$(LOCAL_DIR)/cyanogen_dream_sapphire.mk \
$(LOCAL_DIR)/cyanogen_droid2.mk \
+ $(LOCAL_DIR)/cyanogen_droid2we.mk \
$(LOCAL_DIR)/cyanogen_encore.mk \
$(LOCAL_DIR)/cyanogen_espresso.mk \
$(LOCAL_DIR)/cyanogen_fascinatemtd.mk \
@@ -52,4 +53,5 @@
$(LOCAL_DIR)/cyanogen_z71.mk \
$(LOCAL_DIR)/cyanogen_zeppelin.mk \
$(LOCAL_DIR)/cyanogen_zero.mk \
- $(LOCAL_DIR)/cyanogen_zeus.mk
+ $(LOCAL_DIR)/cyanogen_zeus.mk \
+ $(LOCAL_DIR)/cyanogen_zeusc.mk
diff --git a/products/cyanogen_captivatemtd.mk b/products/cyanogen_captivatemtd.mk
index 61a356e..67c46de 100644
--- a/products/cyanogen_captivatemtd.mk
+++ b/products/cyanogen_captivatemtd.mk
@@ -33,7 +33,8 @@
# Add additional mounts
PRODUCT_PROPERTY_OVERRIDES += \
- ro.additionalmounts=/mnt/emmc
+ ro.additionalmounts=/mnt/emmc \
+ ro.vold.switchablepair=/mnt/sdcard,/mnt/emmc
#
# Set ro.modversion
diff --git a/products/cyanogen_click.mk b/products/cyanogen_click.mk
index 9fec3c9..fc21698 100644
--- a/products/cyanogen_click.mk
+++ b/products/cyanogen_click.mk
@@ -19,7 +19,7 @@
PRODUCT_NAME := cyanogen_click
PRODUCT_BRAND := htc_wwe
PRODUCT_DEVICE := click
-PRODUCT_MODEL := HTC click
+PRODUCT_MODEL := HTC Tattoo
PRODUCT_MANUFACTURER := HTC
PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_click BUILD_ID=GRI40 BUILD_DISPLAY_ID=GRJ90 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"
diff --git a/products/cyanogen_crespo4g.mk b/products/cyanogen_crespo4g.mk
index 82b8747..fbcf0b1 100644
--- a/products/cyanogen_crespo4g.mk
+++ b/products/cyanogen_crespo4g.mk
@@ -12,7 +12,7 @@
PRODUCT_DEVICE := crespo4g
PRODUCT_MODEL := Nexus S 4G
PRODUCT_MANUFACTURER := samsung
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=sojus BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GRJ90 BUILD_FINGERPRINT=google/sojus/crespo4g:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="sojus-user 2.3.4 GRJ22 121341 release-keys" BUILD_NUMBER=121341
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=sojus BUILD_ID=GRJ90 BUILD_DISPLAY_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
diff --git a/products/cyanogen_droid2we.mk b/products/cyanogen_droid2we.mk
new file mode 100644
index 0000000..48c5883
--- /dev/null
+++ b/products/cyanogen_droid2we.mk
@@ -0,0 +1,57 @@
+# Inherit device configuration for Droid2WE.
+$(call inherit-product, device/motorola/droid2we/droid2we.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+
+# Include GSM stuff
+#$(call inherit-product, vendor/cyanogen/products/gsm.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_droid2we
+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
+
+# Build kernel
+#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
+#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
+#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_droid2we_defconfig
+
+# Extra Droid2WE overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/droid2we
+
+# Add the Torch app
+PRODUCT_PACKAGES += Torch
+
+# Build GanOptimizer
+#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-DROID2WE-KANG
+else
+ ifdef CYANOGEN_RELEASE
+ PRODUCT_PROPERTY_OVERRIDES += \
+ ro.modversion=CyanogenMod-7.1.0-RC1-DROID2WE
+ else
+ PRODUCT_PROPERTY_OVERRIDES += \
+ ro.modversion=CyanogenMod-7.1.0-RC1-DROID2WE-KANG
+ endif
+endif
+
+#
+# Copy Droid2WE specific prebuilt files
+#
+PRODUCT_COPY_FILES += \
+ vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_galaxys2.mk b/products/cyanogen_galaxys2.mk
index 9ac19b7..88c7710 100644
--- a/products/cyanogen_galaxys2.mk
+++ b/products/cyanogen_galaxys2.mk
@@ -33,7 +33,8 @@
# Add additional mounts
PRODUCT_PROPERTY_OVERRIDES += \
- ro.additionalmounts=/mnt/emmc
+ ro.additionalmounts=/mnt/emmc \
+ ro.vold.switchablepair=/mnt/sdcard,/mnt/emmc
#
# Set ro.modversion
diff --git a/products/cyanogen_galaxysmtd.mk b/products/cyanogen_galaxysmtd.mk
index 46c7096..f3065bf 100644
--- a/products/cyanogen_galaxysmtd.mk
+++ b/products/cyanogen_galaxysmtd.mk
@@ -36,7 +36,8 @@
# Add additional mounts
PRODUCT_PROPERTY_OVERRIDES += \
- ro.additionalmounts=/mnt/emmc
+ ro.additionalmounts=/mnt/emmc \
+ ro.vold.switchablepair=/mnt/sdcard,/mnt/emmc
#
# Set ro.modversion
diff --git a/products/cyanogen_vibrantmtd.mk b/products/cyanogen_vibrantmtd.mk
index 992b7f9..62091eb 100644
--- a/products/cyanogen_vibrantmtd.mk
+++ b/products/cyanogen_vibrantmtd.mk
@@ -36,7 +36,8 @@
# Add additional mounts
PRODUCT_PROPERTY_OVERRIDES += \
- ro.additionalmounts=/mnt/emmc
+ ro.additionalmounts=/mnt/emmc \
+ ro.vold.switchablepair=/mnt/sdcard,/mnt/emmc
#
# Set ro.modversion
diff --git a/products/cyanogen_zeusc.mk b/products/cyanogen_zeusc.mk
new file mode 100644
index 0000000..76c89ce
--- /dev/null
+++ b/products/cyanogen_zeusc.mk
@@ -0,0 +1,53 @@
+# Inherit device configuration for zeus.
+$(call inherit-product, device/semc/zeus/device_zeus.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_zeusc
+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"
+
+# Build kernel
+#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
+#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
+#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_zeus_defconfig
+
+# Extra zeus overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/zeus
+
+# Add the Torch app
+#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-R800x
+else
+ ifdef CYANOGEN_RELEASE
+ PRODUCT_PROPERTY_OVERRIDES += \
+ ro.modversion=CyanogenMod-7.1.0-RC1-XperiaPlay-R800x
+ else
+ PRODUCT_PROPERTY_OVERRIDES += \
+ ro.modversion=CyanogenMod-7.1.0-RC1-XperiaPlay-R800x-KANG
+ endif
+endif
+
+#
+# Copy passion specific prebuilt files
+#
+PRODUCT_COPY_FILES += \
+ vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 7dc8982..cc7ea64 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -11,6 +11,7 @@
add_lunch_combo cyanogen_desirec-eng
add_lunch_combo cyanogen_dream_sapphire-eng
add_lunch_combo cyanogen_droid2-eng
+add_lunch_combo cyanogen_droid2we-eng
add_lunch_combo cyanogen_encore-eng
add_lunch_combo cyanogen_espresso-eng
add_lunch_combo cyanogen_fascinatemtd-eng
@@ -52,4 +53,5 @@
add_lunch_combo cyanogen_zeppelin-eng
add_lunch_combo cyanogen_zero-eng
add_lunch_combo cyanogen_zeus-eng
+add_lunch_combo cyanogen_zeusc-eng