diff options
| author | Brint E. Kriebel <bkriebel@vmware.com> | 2012-11-01 01:23:29 -0600 |
|---|---|---|
| committer | Brint E. Kriebel <bkriebel@vmware.com> | 2012-11-01 01:27:15 -0600 |
| commit | 4fce921b8a6c36b258d496e060c766e61a0e8f1d (patch) | |
| tree | 8a9f8779c8b2dd25a17be96b4510446c67c39cce /tools/device | |
| parent | 07b89fe2ff0b1c7f1ce2d25a8918612470a71725 (diff) | |
| download | build-4fce921b8a6c36b258d496e060c766e61a0e8f1d.zip build-4fce921b8a6c36b258d496e060c766e61a0e8f1d.tar.gz build-4fce921b8a6c36b258d496e060c766e61a0e8f1d.tar.bz2 | |
recoveryzip: Fix build of recoveryzip
The recoveryzip target was failing due to the change in the
handling of OUT_DIR. This removes the script's attempts to
set the path itself and uses the common variables instead.
Change-Id: I2a1334e940881005b9d3445b387858edf6da264a
Diffstat (limited to 'tools/device')
| -rwxr-xr-x | tools/device/mkrecoveryzip.sh | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tools/device/mkrecoveryzip.sh b/tools/device/mkrecoveryzip.sh index e6fae37..e6ce6f8 100755 --- a/tools/device/mkrecoveryzip.sh +++ b/tools/device/mkrecoveryzip.sh @@ -1,4 +1,5 @@ #!/bin/bash +# Portions Copyright (C) 2012 VMware, Inc. All Rights Reserved. OUT=$1 SIGNAPK=$2 @@ -9,10 +10,6 @@ then exit 1 fi -ANDROID_ROOT=$(pwd) -OUT=$ANDROID_ROOT/$OUT -SIGNAPK=$ANDROID_ROOT/$SIGNAPK - pushd . > /dev/null 2> /dev/null UTILITIES_DIR=$OUT/utilities @@ -91,7 +88,7 @@ rm -f $UTILITIES_DIR/unsigned.zip rm -f $UTILITIES_DIR/update.zip echo zip -ry $UTILITIES_DIR/unsigned.zip . -x $SYMLINKS '*\[*' '*\[\[*' zip -ry $UTILITIES_DIR/unsigned.zip . -x $SYMLINKS '*\[*' '*\[\[*' -java -jar $SIGNAPK -w $ANDROID_ROOT/build/target/product/security/testkey.x509.pem $ANDROID_ROOT/build/target/product/security/testkey.pk8 $UTILITIES_DIR/unsigned.zip $UTILITIES_DIR/update.zip +java -jar $SIGNAPK -w $ANDROID_BUILD_TOP/build/target/product/security/testkey.x509.pem $ANDROID_BUILD_TOP/build/target/product/security/testkey.pk8 $UTILITIES_DIR/unsigned.zip $UTILITIES_DIR/update.zip echo Recovery FakeFlash is now available at $OUT/utilities/update.zip popd > /dev/null 2> /dev/null |