diff options
| author | Raphael Moll <ralf@android.com> | 2014-05-09 23:36:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-09 23:36:36 +0000 |
| commit | 61fd3e6743dc09e54eec5e9e6b796bd460f66f1c (patch) | |
| tree | 49a6d509b8f3e50e24f15e5e717d27af02ccfece | |
| parent | 47776e7cd23dc5b4bae3ffc06141e267d2a71359 (diff) | |
| parent | 077432c1bd1f6c5a5b1a76353add98d5333f2ebe (diff) | |
| download | sdk-61fd3e6743dc09e54eec5e9e6b796bd460f66f1c.zip sdk-61fd3e6743dc09e54eec5e9e6b796bd460f66f1c.tar.gz sdk-61fd3e6743dc09e54eec5e9e6b796bd460f66f1c.tar.bz2 | |
Merge "Fix win_sdk."
| -rwxr-xr-x | build/patch_windows_sdk.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/build/patch_windows_sdk.sh b/build/patch_windows_sdk.sh index 54fc7b7..addcc02 100755 --- a/build/patch_windows_sdk.sh +++ b/build/patch_windows_sdk.sh @@ -23,12 +23,11 @@ set -e # any error stops the build # Verbose by default. Use -q to make more silent. -V="" if [[ "$1" == "-q" ]]; then shift else echo "Win SDK: $0 $*" - set -x # show bash commands; no need for V=-v + set -x # show bash commands fi TEMP_SDK_DIR=$1 @@ -36,9 +35,10 @@ WIN_OUT_DIR=$2 TOPDIR=${TOPDIR:-$3} # Invoke atree to copy the files -# TODO: pass down OUT_HOST_EXECUTABLE to get the right bin/atree directory -${TOPDIR}out/host/linux-x86/bin/atree -f ${TOPDIR}sdk/build/tools.windows.atree \ - -I $WIN_OUT_DIR/host/windows-x86 \ - -I ${TOPDIR:-.} \ - -o $TEMP_SDK_DIR +if [[ -f ${TOPDIR}sdk/build/tools.windows.atree ]]; then + ${TOPDIR}out/host/linux-x86/bin/atree -f ${TOPDIR}sdk/build/tools.windows.atree \ + -I $WIN_OUT_DIR/host/windows-x86 \ + -I ${TOPDIR:-.} \ + -o $TEMP_SDK_DIR +fi |