squisher: Get rid of it.

The pngcrush tool does not add any noticeable value any more, such that it justifies the extra build time: 240MB vs 238MB.
The build.prop changes are now no ops, since the key for ro.kernel.android.checkjni no longer exists.
Changing the ro.build.type from eng to user is also a no op, since CM is now userdebug.
Deleting bins is also unncessary now.
Stripping modules is also unnecessary now. (plenty of space)

At this point, I think we can just symlink $OUTFILE to $OTAPACKAGE, and not even bother
with a copy.

Change-Id: I431ac6425dedb6cd02eb2d31fc9ff82b49df9f50
This commit is contained in:
Koushik Dutta 2012-12-22 11:39:28 -08:00
parent 129989b172
commit 6ed2e1b1cd

View File

@ -30,81 +30,13 @@ if [ ! -f "$OTAPACKAGE" ]; then
exit 1 exit 1
fi fi
OPTICHARGER=$ANDROID_BUILD_TOP/vendor/cm/tools/opticharger # Determine what to name the new package
QUIET=-q MODVERSION=`sed -n -e'/ro\.cm\.version/s/^.*=//p' $OUT/system/build.prop`
DELETE_BINS="applypatch applypatch_static check_prereq recovery updater"
REPACK=$OUT/repack.d
printf "Sanitizing environment..."
rm -rf $REPACK
mkdir -p $REPACK
echo
# Unpack the otapackage and opticharge all apks
mkdir $REPACK/ota
(
cd $REPACK/ota
printf "Unpacking $OTAPACKAGE..."
unzip $QUIET $OTAPACKAGE
echo
# Move all apks to the same directory so xargs can
# use also with framework-res.apk. This allow process
# framework-res.apk in parallel with other apks
mkdir -p $REPACK/parallel
cd $REPACK/parallel
cp $REPACK/ota/system/framework/framework-res.apk .
cp $REPACK/ota/system/app/*.apk .
# Do optimization in parallel
find ./ -name \*.apk | $XARGS $OPTICHARGER
# Move optimized apks to repack directory
mv -f $REPACK/parallel/framework-res.apk $REPACK/ota/system/framework/framework-res.apk
mv -f $REPACK/parallel/*.apk $REPACK/ota/system/app/
# Return to directory
cd $REPACK/ota
rm -rf $REPACK/parallel
)
# Fix build.prop
$SED -i \
-e '/ro\.kernel\.android\.checkjni/d' \
-e '/ro\.build\.type/s/eng/user/' \
$REPACK/ota/system/build.prop
# Delete unnecessary binaries
( cd $REPACK/ota/system/bin; echo $DELETE_BINS | xargs rm -f; )
# No need for recovery
rm -rf $REPACK/ota/recovery
# Strip modules
[ -d $REPACK/ota/system/lib/modules ] && \
find $REPACK/ota/system/lib/modules -name "*.ko" -print0 | xargs -0 arm-eabi-strip --strip-unneeded
# Determine what to name the new signed package
MODVERSION=`sed -n -e'/ro\.cm\.version/s/^.*=//p' $REPACK/ota/system/build.prop`
OUTFILE=$OUT/cm-$MODVERSION.zip
echo -e $CL_CYN"MODVERSION: $MODVERSION"$CL_RST echo -e $CL_CYN"MODVERSION: $MODVERSION"$CL_RST
OUTFILE=$OUT/cm-$MODVERSION.zip
# Pack it up and sign cp $OTAPACKAGE $OUTFILE.tmp
printf "Zipping package..." mv $OUTFILE.tmp $OUTFILE
( cd $REPACK/ota; zip $QUIET -r $REPACK/update.zip . )
echo
printf "Signing package..."
SECURITYDIR=$ANDROID_BUILD_TOP/build/target/product/security
java -Xmx1024m \
-jar $OUT/../../../host/$OUT_TARGET_HOST/framework/signapk.jar \
-w $SECURITYDIR/testkey.x509.pem $SECURITYDIR/testkey.pk8 \
$REPACK/update.zip $OUTFILE
echo
printf "Cleaning up..."
rm -rf $REPACK
echo
# Create a md5 checksum image of the repacked package # Create a md5 checksum image of the repacked package
( (