Merge "Trebuchet: Remove overlay" into cm-10.1
diff --git a/CONTRIBUTORS.mkdn b/CONTRIBUTORS.mkdn
index 25d409c..1a1ef76 100644
--- a/CONTRIBUTORS.mkdn
+++ b/CONTRIBUTORS.mkdn
@@ -48,11 +48,13 @@
------------
* __Catalan:__ Oriol Pellicer
* __Croatian:__ Antonio Marin
-* __Czech:__ Ondrej Zima
+* __Czech:__ Ondrej Zima, Radovan Kepak, Pavel Kucera, Jozka Jozin, Jiri Silvarich, Vaclav Moucha
* __Dutch:__ Marco Brohet, Kasper Hettinga, Sam Segers, Bart Tiemersma, Eddy Witkamp
-* __Finnish:__ Antti Leukkunen
+* __Finnish:__ Antti Leukkunen, Niko Koivu
* __French:__ Sébastien Vaucher, David Girault, Tanguy Pruvot
-* __German:__ Matthias Büchner, Alexander Hofbauer, Sebastian K., Ricco Thiel, Andreas Böhm, Kim Lê
+* __German:__ Kim Lê, Jacob Müller, Patrick Schaaf, Christoph Quiter, Markus Hoeber, Matthias Büchner
+* __Greek:__ Michael Bestas
+* __Hungarian:__ Tamás Tóth, Dávid László, Dániel Buga
* __Italian:__ Francesco Foresta, Moreno Pojer, Eugenio Ziliotto, Giulio Cervera, Mauro Bazzano
* __Japanese:__ Takuo Kitame
* __Korean:__ Inseok Lee
@@ -65,3 +67,4 @@
* __Spanish:__ PeRiJeY, KalimochoAz, Chuckycrx, Jorge Ruesga
* __Swedish:__ Patrik Kullman
* __Traditional Chinese:__ Ladios Jonquil
+* __Turkish:__ Ethem Evlice (androidmeda)
diff --git a/config/common.mk b/config/common.mk
index b776cd8..3a42ca2 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -99,9 +99,24 @@
PRODUCT_COPY_FILES += \
vendor/cm/prebuilt/common/bin/modelid_cfg.sh:system/bin/modelid_cfg.sh
+PRODUCT_COPY_FILES += \
+ vendor/cm/proprietary/Term.apk:system/app/Term.apk
+
+# Copy JNI libarary of Term
+ifeq ($(TARGET_ARCH),arm)
PRODUCT_COPY_FILES += \
- vendor/cm/proprietary/Term.apk:system/app/Term.apk \
vendor/cm/proprietary/lib/armeabi/libjackpal-androidterm4.so:system/lib/libjackpal-androidterm4.so
+endif
+
+ifeq ($(TARGET_ARCH),mips)
+PRODUCT_COPY_FILES += \
+ vendor/cm/proprietary/lib/mips/libjackpal-androidterm4.so:system/lib/libjackpal-androidterm4.so
+endif
+
+ifeq ($(TARGET_ARCH),x86)
+PRODUCT_COPY_FILES += \
+ vendor/cm/proprietary/lib/x86/libjackpal-androidterm4.so:system/lib/libjackpal-androidterm4.so
+endif
# Bring in camera effects
PRODUCT_COPY_FILES += \
diff --git a/get-prebuilts b/get-prebuilts
index 1d9493f..1d2b6df 100755
--- a/get-prebuilts
+++ b/get-prebuilts
@@ -4,6 +4,6 @@
mkdir -p $BASEDIR/proprietary
# Get Android Terminal Emulator (we use a prebuilt so it can update from the Market)
-curl -L -o $BASEDIR/proprietary/Term.apk -O -L https://github.com/downloads/jackpal/Android-Terminal-Emulator/Term.apk
-unzip -o -d $BASEDIR/proprietary $BASEDIR/proprietary/Term.apk lib/armeabi/libjackpal-androidterm4.so
+curl -L -o $BASEDIR/proprietary/Term.apk -O -L http://jackpal.github.com/Android-Terminal-Emulator/downloads/Term.apk
+unzip -o -d $BASEDIR/proprietary $BASEDIR/proprietary/Term.apk lib/*
diff --git a/prebuilt/common/etc/apns-conf-cdma.xml b/prebuilt/common/etc/apns-conf-cdma.xml
index f0d5c23..42a0d77 100644
--- a/prebuilt/common/etc/apns-conf-cdma.xml
+++ b/prebuilt/common/etc/apns-conf-cdma.xml
@@ -28,6 +28,12 @@
<apn carrier="Boost MMS" mcc="505" mnc="02" apn="mms" user="" password="" server="" proxy="61.88.190.10" port="8070" mmsc="http://mmsc.optus.com.au:8002/" mmsproxy="61.88.190.10" mmsport="8070" type="mms" authtype="3"/>
<apn carrier="Boost Mobile" mcc="505" mnc="02" apn="yesinternet" user="" password="" server="" proxy="" port="" mmsc="" mmsproxy="" mmsport="" type="default,supl" authtype="3"/>
+<!-- Cricket: LTE Apn -->
+ <apn carrier="LTE INTERNET" mcc="310" mnc="090" apn="4g.mycricket.com" user="" password="" type="default,dun,mms" authtype="0" mmsc="http://mms.mycricket.com/servlets/mms" protocol="IP" roaming_protocol="IP" bearer="14"/>
+ <apn carrier="LTE ADMIN" mcc="310" mnc="090" apn="Apnota.4g.mycricket.com" user="" password="" type="fota" authtype="0" mmsc="http://mms.mycricket.com/servlets/mms" protocol="IP" roaming_protocol="IP" bearer="14"/>
+ <apn carrier="LTE DNSADMIN" mcc="310" mnc="090" apn="apndnsota.4g.mycricket.com" user="" password="" type="fota" authtype="0" mmsc="http://mms.mycricket.com/servlets/mms" protocol="IP" roaming_protocol="IP" bearer="14"/>
+<!-- end Cricket: LTE Apn -->
+
<!-- MetroPCS: LTE Apn -->
<apn carrier="MetroPCS DEFAULT" mcc="311" mnc="660" apn="internet.metropcs" user="" password="" type="default,hipri,admin,mms" authtype="0" mmsc="http://mms.metropcs.net:3128/mmsc" protocol="IP" roaming_protocol="IP" bearer="14" inactivity_timer="7080" />
<apn carrier="MetroPCS IMS" mcc="311" mnc="660" apn="ims.metropcs" user="" password="" type="ims" authtype="0" mmsc="http://mms.metropcs.net:3128/mmsc" protocol="IP" roaming_protocol="IP" bearer="14" inactivity_timer="7080" />
diff --git a/tools/squisher b/tools/squisher
index a3f8a45..e3b8251 100755
--- a/tools/squisher
+++ b/tools/squisher
@@ -44,7 +44,7 @@
$MD5 $img >$img.md5sum
echo
echo -e $CL_GRN"Package complete: $OUTFILE"$CL_RST
-cat $img.md5sum
+echo -e $CL_GRN"md5: $(cat $img.md5sum | awk '{ print $1 }')"$CL_RST
echo
)