Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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
  • Loading branch information...
commit 4fce921b8a6c36b258d496e060c766e61a0e8f1d 1 parent 07b89fe
@bekriebel bekriebel authored
Showing with 2 additions and 5 deletions.
  1. +2 −5 tools/device/mkrecoveryzip.sh
View
7 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
Please sign in to comment.
Something went wrong with that request. Please try again.