commit ffe6f59740aeb155ee95baa14f10e43f32bb7307
author Xin Li <delphij@google.com> Thu Jul 28 17:59:30 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 28 17:59:30 2016 +0000
tree 9aea781272fe2e706904e5112e7c8ef13216d03e
parent 762617a12642c9de3e3ce66b26f6c8b122c06e0f
parent d34002fb872590f80f2b780ee103cbef8a8b3619

Consistently use SHA256 for filenames (previously, MD5 and SHA1 were used). am: 72a67b76c6 am: 4b636830cd am: 074067b725
am: d34002fb87

Change-Id: If60a99470f09e7b8f51bc58403084e941d658ced

generate-factory-images-common.sh

diff --git a/generate-factory-images-common.sh b/generate-factory-images-common.sh
index 63ab260..b8d6707 100644
--- a/generate-factory-images-common.sh
+++ b/generate-factory-images-common.sh
@@ -294,7 +294,7 @@
 
 # Create the distributable package
 (cd tmp ; tar zcvf ../$PRODUCT-$VERSION-factory.tgz $PRODUCT-$VERSION)
-mv $PRODUCT-$VERSION-factory.tgz $PRODUCT-$VERSION-factory-$(sha1sum < $PRODUCT-$VERSION-factory.tgz | cut -b -8).tgz
+mv $PRODUCT-$VERSION-factory.tgz $PRODUCT-$VERSION-factory-$(sha256sum < $PRODUCT-$VERSION-factory.tgz | cut -b -8).tgz
 
 # Clean up
 rm -rf tmp

generate-packages.sh

diff --git a/generate-packages.sh b/generate-packages.sh
index c48d328..7b1b244 100755
--- a/generate-packages.sh
+++ b/generate-packages.sh
@@ -139,7 +139,7 @@
   cat PART3 >> tmp/$SCRIPT || echo \ \ \ \ Error generating script
   (cd tmp ; tar zc --owner=root --group=root vendor/ >> $SCRIPT || echo \ \ \ \ Error generating embedded tgz)
   chmod a+x tmp/$SCRIPT || echo \ \ \ \ Error generating script
-  ARCHIVE=$COMPANY-$DEVICE-$BUILD-$(md5sum < tmp/$SCRIPT | cut -b -8 | tr -d \\n).tgz
+  ARCHIVE=$COMPANY-$DEVICE-$BUILD-$(sha256sum < tmp/$SCRIPT | cut -b -8 | tr -d \\n).tgz
   rm -f $ARCHIVE
   echo \ \ Generating final archive
   (cd tmp ; tar --owner=root --group=root -z -c -f ../$ARCHIVE $SCRIPT || echo \ \ \ \ Error archiving script)