Merge "prebuilt: common: apns-conf-cdma.xml: Fix USCC apn" into jellybean
diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index e34bd2b..7110d03 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -20,6 +20,7 @@
* Motorola Xoom (stingray): TDR, Steady Hawkin, Bazar6 (Team Rogue)
* Motorola Xoom (wingray): TDR, Steady Hawkin, Bazar6 (Team Rogue)
* Samsung Epic 4G (SPH-D700): noobnl, Decad3nce, mkasick, UberPinguin, wtogami, bbelos (Team Epic)
+* Samsung Fascinate (SCH-I500): jt1134, sbrissen
* Samsung Galaxy Note (GT-N7000): Entropy512, xplodwild
* Samsung Galaxy Note AT&T (SGH-I717): cyanogen
* Samsung Galaxy S (GT-I9000): pawitp
diff --git a/jenkins-build-targets b/jenkins-build-targets
new file mode 100644
index 0000000..c92fc60
--- /dev/null
+++ b/jenkins-build-targets
@@ -0,0 +1,26 @@
+cm_captivatemtd-userdebug
+cm_crespo-userdebug
+cm_crespo4g-userdebug
+cm_d2att-userdebug
+cm_d2spr-userdebug
+cm_d2tmo-userdebug
+cm_d2vzw-userdebug
+cm_fascinatemtd-userdebug
+cm_galaxysmtd-userdebug
+cm_galaxysbmtd-userdebug
+cm_grouper-userdebug
+cm_i9100g-userdebug
+cm_maguro-userdebug
+cm_p3100-userdebug
+cm_p3110-userdebug
+cm_p3113-userdebug
+cm_p5100-userdebug
+cm_p5110-userdebug
+cm_p5113-userdebug
+cm_p930-userdebug
+cm_su640-userdebug
+cm_tf101-userdebug
+cm_tf201-userdebug
+cm_toro-userdebug
+cm_toroplus-userdebug
+cm_vibrantmtd-userdebug
diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index a62680f..a9a13fc 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -1385,4 +1385,8 @@
<apn carrier="Movistar UY" mcc="748" mnc="07" apn="apnumt.movistar.com.uy" user="movistar" password="movistar" type="default,supl" />
<apn carrier="Claro UY" mcc="748" mnc="10" apn="gprs.claro.com.uy" user="ctigpr" password="ctigpr999" type="default,supl" />
<apn carrier="Claro UY MMS" mcc="748" mnc="10" apn="mms.ctimovil.com.uy" user="ctimms" password="ctimms999" mmsc="http://mms.ctimovil.com.uy" mmsproxy="170.051.255.240" mmsport="9201" type="mms" />
+ <apn carrier="MD MOLDCELL" mcc="259" mnc="02" apn="internet" type="default,supl" />
+ <apn carrier="MD MOLDCELL" mcc="259" mnc="02" apn="mms" mmsproxy="010.000.010.010" mmsport="9401" mmsc="http://mms.moldcell.md/cmmsc/post" type="mms" />
+ <apn carrier="ORANGE INTERNET" mcc="259" mnc="01" apn="wap.orange.md" type="default,supl" />
+ <apn carrier="ORANGE MMS" mcc="259" mnc="01" apn="mms.orange.md" mmsproxy="192.168.127.125" mmsport="3128" mmsc="http://mms/mmsc" type="mms" />
</apns>
diff --git a/tools/opticharger b/tools/opticharger
index 33489d8..a3d7ade 100755
--- a/tools/opticharger
+++ b/tools/opticharger
@@ -9,14 +9,6 @@
# cyanogen - shade@chemlab.org
# ChrisSoyars - me@ctso.me
-OUT_TARGET_HOST=$(uname -a | grep Darwin)
-if [ -z "$OUT_TARGET_HOST" ]
-then
- OUT_TARGET_HOST=linux-x86
-else
- OUT_TARGET_HOST=darwin-x86
-fi
-
set -e
QUIET=1
BASE=`pwd`
@@ -32,6 +24,8 @@
then
if [ "$TARGET_BUILD_VARIANT" = "userdebug" ]; then
TARGET_BUILD_VARIANT="eng"
+ elif [ "$TARGET_BUILD_VARIANT" = "user" ]; then
+ TARGET_BUILD_VARIANT="eng"
fi
APKCERTS=$OUT/obj/PACKAGING/target_files_intermediates/$TARGET_PRODUCT-target_files-$TARGET_BUILD_VARIANT.$USER/META/apkcerts.txt
@@ -114,6 +108,11 @@
echo "Unable to find certificate for $NAME"
exit 1;
fi
+ if [ "$CERT" = "PRESIGNED" ];
+ then
+ echo "$NAME is presigned, skipping"
+ exit 1;
+ fi
fi
[ $QUIET ] || echo "Certificate: $CERT";
@@ -131,12 +130,12 @@
cp $BASE/$1 $BASE/$1.old
[ $QUIET ] || echo "Repacking apk.."
- aapt p -0 .dat -0 .dict -F $NAME .
+ aapt p -0 .dat -0 .dict -0 .arsc -F $NAME .
[ $QUIET ] || echo "Resigning with cert: `echo $CERT`"
- [ $QUIET ] || echo java -jar $OUT/../../../host/$OUT_TARGET_HOST/framework/signapk.jar $ANDROID_BUILD_TOP/$CERT $ANDROID_BUILD_TOP/$KEY $NAME signed_$NAME
- java -jar $OUT/../../../host/$OUT_TARGET_HOST/framework/signapk.jar $ANDROID_BUILD_TOP/$CERT $ANDROID_BUILD_TOP/$KEY $NAME signed_$NAME
+ [ $QUIET ] || echo java -jar $ANDROID_HOST_OUT/framework/signapk.jar $ANDROID_BUILD_TOP/$CERT $ANDROID_BUILD_TOP/$KEY $NAME signed_$NAME
+ java -jar $ANDROID_HOST_OUT/framework/signapk.jar $ANDROID_BUILD_TOP/$CERT $ANDROID_BUILD_TOP/$KEY $NAME signed_$NAME
[ $QUIET ] || echo "Zipalign.."
zipalign -f 4 signed_$NAME $BASE/$1
if [ ! $QUIET ]; then
diff --git a/tools/squisher b/tools/squisher
index 250a248..ce94537 100755
--- a/tools/squisher
+++ b/tools/squisher
@@ -27,6 +27,8 @@
OTAPACKAGE=$OUT/${TARGET_PRODUCT}_debug-ota-$TARGET_BUILD_VARIANT.$USER.zip
elif [ "$TARGET_BUILD_VARIANT" = "userdebug" ]; then
OTAPACKAGE=$OUT/$TARGET_PRODUCT-ota-eng.$USER.zip
+elif [ "$TARGET_BUILD_VARIANT" = "user" ]; then
+ OTAPACKAGE=$OUT/$TARGET_PRODUCT-ota-eng.$USER.zip
else
OTAPACKAGE=$OUT/$TARGET_PRODUCT-ota-$TARGET_BUILD_VARIANT.$USER.zip
fi
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 49913fd..aede0f6 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -1,55 +1,4 @@
-#add_lunch_combo cm_anzu-userdebug
-#add_lunch_combo cm_captivatemtd-userdebug
-#add_lunch_combo cm_coconut-userdebug
-#add_lunch_combo cm_crespo-userdebug
-#add_lunch_combo cm_crespo4g-userdebug
-#add_lunch_combo cm_d2att-userdebug
-#add_lunch_combo cm_d2spr-userdebug
-#add_lunch_combo cm_d2tmo-userdebug
-#add_lunch_combo cm_epicmtd-userdebug
-#add_lunch_combo cm_e730-userdebug
-#add_lunch_combo cm_e739-userdebug
-#add_lunch_combo cm_galaxysbmtd-userdebug
-#add_lunch_combo cm_galaxysmtd-userdebug
-#add_lunch_combo cm_galaxys2-userdebug
-add_lunch_combo cm_grouper-userdebug
-#add_lunch_combo cm_haida-userdebug
-#add_lunch_combo cm_hallon-userdebug
-#add_lunch_combo cm_hercules-userdebug
-#add_lunch_combo cm_i777-userdebug
-#add_lunch_combo cm_i9100g-userdebug
-#add_lunch_combo cm_i9300-userdebug
-#add_lunch_combo cm_iyokan-userdebug
-#add_lunch_combo cm_mango-userdebug
-add_lunch_combo cm_maguro-userdebug
-#add_lunch_combo cm_n7000-userdebug
-#add_lunch_combo cm_p1-userdebug
-#add_lunch_combo cm_p1c-userdebug
-#add_lunch_combo cm_p3-userdebug
-#add_lunch_combo cm_p4-userdebug
-#add_lunch_combo cm_p4tmo-userdebug
-#add_lunch_combo cm_p4vzw-userdebug
-#add_lunch_combo cm_p4wifi-userdebug
-#add_lunch_combo cm_p5-userdebug
-#add_lunch_combo cm_p5wifi-userdebug
-#add_lunch_combo cm_p930-userdebug
-#add_lunch_combo cm_pyramid-userdebug
-#add_lunch_combo cm_quincyatt-userdebug
-#add_lunch_combo cm_satsuma-userdebug
-#add_lunch_combo cm_shooter-userdebug
-#add_lunch_combo cm_shooteru-userdebug
-#add_lunch_combo cm_skyrocket-userdebug
-#add_lunch_combo cm_smb_a1011-userdebug
-#add_lunch_combo cm_smultron-userdebug
-#add_lunch_combo cm_stingray-userdebug
-#add_lunch_combo cm_tenderloin-userdebug
-#add_lunch_combo cm_tf101-userdebug
-#add_lunch_combo cm_tf201-userdebug
-#add_lunch_combo cm_tf300t-userdebug
-add_lunch_combo cm_toro-userdebug
-add_lunch_combo cm_toroplus-userdebug
-#add_lunch_combo cm_urushi-userdebug
-#add_lunch_combo cm_vibrantmtd-userdebug
-#add_lunch_combo cm_wingray-userdebug
-#add_lunch_combo cm_zeus-userdebug
-#add_lunch_combo cm_zeusc-userdebug
+for combo in $(cat vendor/cm/jenkins-build-targets)
+do
+ add_lunch_combo $combo
+done