Merge "LICENSE: update year" into jellybean
diff --git a/config/common.mk b/config/common.mk
index 3213927..3a2e547 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -98,8 +98,7 @@
PRODUCT_COPY_FILES += \
vendor/cm/proprietary/RomManager.apk:system/app/RomManager.apk \
vendor/cm/proprietary/Term.apk:system/app/Term.apk \
- vendor/cm/proprietary/lib/armeabi/libjackpal-androidterm4.so:system/lib/libjackpal-androidterm4.so \
- vendor/cm/prebuilt/common/apps/Superuser.apk:system/app/Superuser.apk
+ vendor/cm/proprietary/lib/armeabi/libjackpal-androidterm4.so:system/lib/libjackpal-androidterm4.so
# Bring in camera effects
PRODUCT_COPY_FILES += \
@@ -128,7 +127,6 @@
LatinIME \
SpareParts \
Superuser \
- Superuser.apk \
su
# Optional CM packages
@@ -152,7 +150,13 @@
openvpn \
e2fsck \
mke2fs \
- tune2fs
+ tune2fs \
+ bash \
+ vim \
+ nano \
+ htop \
+ powertop \
+ lsof
# Openssh
PRODUCT_PACKAGES += \
diff --git a/jenkins-build-targets b/jenkins-build-targets
index a239992..fed1aeb 100644
--- a/jenkins-build-targets
+++ b/jenkins-build-targets
@@ -22,6 +22,7 @@
cm_mesmerizemtd-userdebug
cm_n7000-userdebug
cm_quincyatt-userdebug
+cm_quincytmo-userdebug
cm_p1-userdebug
cm_p1c-userdebug
cm_p1l-userdebug
@@ -33,6 +34,7 @@
cm_p5110-userdebug
cm_p5113-userdebug
cm_p930-userdebug
+cm_p970-userdebug
cm_stingray-userdebug
cm_su640-userdebug
cm_tf101-userdebug
diff --git a/prebuilt/common/apps/Superuser.apk b/prebuilt/common/apps/Superuser.apk
deleted file mode 100644
index a550070..0000000
--- a/prebuilt/common/apps/Superuser.apk
+++ /dev/null
Binary files differ
diff --git a/tools/squisher b/tools/squisher
index ce94537..54498f2 100755
--- a/tools/squisher
+++ b/tools/squisher
@@ -23,15 +23,6 @@
exit 1
fi
-if [ "$TARGET_BUILD_TYPE" = "debug" ]; then
- 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
if [ ! -f "$OTAPACKAGE" ]; then
echo "$OTAPACKAGE doesn't exist!";
exit 1