Merge "Add Greek dictionary" into ics
diff --git a/config/common.mk b/config/common.mk
index 278fcee..1d91d6c 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -42,7 +42,11 @@
vendor/cm/proprietary/RomManager.apk:system/app/RomManager.apk \
vendor/cm/proprietary/Term.apk:system/app/Term.apk \
vendor/cm/proprietary/lib/armeabi/libjackpal-androidterm3.so:system/lib/libjackpal-androidterm3.so \
- vendor/cm/prebuilt/common/bootanimation.zip:system/media/bootanimation.zip \
+ vendor/cm/prebuilt/common/bootanimation.zip:system/media/bootanimation.zip
+
+# Bring in camera effects & videos
+$(call inherit-product, frameworks/base/data/videos/VideoPackage2.mk)
+PRODUCT_COPY_FILES += \
vendor/cm/prebuilt/common/media/LMprec_508.emd:system/media/LMprec_508.emd \
vendor/cm/prebuilt/common/media/PFFprec_600.emd:system/media/PFFprec_600.emd
@@ -50,6 +54,10 @@
PRODUCT_COPY_FILES += \
frameworks/base/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml
+# Don't export PS1 in /system/etc/mkshrc.
+PRODUCT_COPY_FILES += \
+ vendor/cm/prebuilt/common/etc/mkshrc:system/etc/mkshrc
+
# Required CM packages
PRODUCT_PACKAGES += \
Camera \
@@ -77,6 +85,7 @@
# Custom CM packages
PRODUCT_PACKAGES += \
Trebuchet \
+ CMStats \
DSPManager \
libcyanogen-dsp \
audio_effects.conf
diff --git a/prebuilt/common/etc/mkshrc b/prebuilt/common/etc/mkshrc
new file mode 100644
index 0000000..e2a55d3
--- /dev/null
+++ b/prebuilt/common/etc/mkshrc
@@ -0,0 +1,29 @@
+# Copyright (c) 2010
+# Thorsten Glaser <t.glaser@tarent.de>
+# This file is provided under the same terms as mksh.
+#-
+# Minimal /system/etc/mkshrc for Android
+
+: ${TERM:=vt100} ${HOME:=/data} ${MKSH:=/system/bin/sh} ${HOSTNAME:=android}
+: ${SHELL:=$MKSH} ${USER:=$(typeset x=$(id); x=${x#*\(}; print -r -- ${x%%\)*})}
+if (( USER_ID )); then PS1='$'; else PS1='#'; fi
+function precmd {
+ typeset e=$?
+
+ (( e )) && print -n "$e|"
+}
+PS1='$(precmd)$USER@$HOSTNAME:${PWD:-?} '"$PS1 "
+export HOME HOSTNAME MKSH SHELL TERM USER
+alias l='ls'
+alias la='l -a'
+alias ll='l -l'
+alias lo='l -a -l'
+
+for p in ~/.bin; do
+ [[ -d $p/. ]] || continue
+ [[ :$PATH: = *:$p:* ]] || PATH=$p:$PATH
+done
+
+unset p
+
+: place customisations above this line
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 90d03c1..78de708 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -1,15 +1,17 @@
add_lunch_combo cm_crespo-userdebug
add_lunch_combo cm_crespo4g-userdebug
+add_lunch_combo cm_maguro-userdebug
add_lunch_combo cm_p4tmo-userdebug
add_lunch_combo cm_p4vzw-userdebug
add_lunch_combo cm_p4wifi-userdebug
-add_lunch_combo cm_maguro-userdebug
add_lunch_combo cm_p920-userdebug
add_lunch_combo cm_p970-userdebug
add_lunch_combo cm_p990-userdebug
add_lunch_combo cm_p999-userdebug
add_lunch_combo cm_pyramid-userdebug
add_lunch_combo cm_shooter-userdebug
+add_lunch_combo cm_shooteru-userdebug
add_lunch_combo cm_smb_a1011-userdebug
+add_lunch_combo cm_tenderloin-userdebug
add_lunch_combo cm_toro-userdebug
add_lunch_combo cm_wingray-userdebug