aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaphael <raphael@google.com>2011-02-02 11:57:42 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-02-02 11:57:42 -0800
commit38f76182dcc340b1dac76c7143b9fbd4ccc0f05b (patch)
tree2eef0ec196101298420089871940b284fc0727e8
parentfe171a50cf5558d0232bbaa602d14d1b38b59edb (diff)
parent729d89418821a6c61231ba26be7608c5952f9c30 (diff)
downloadsdk-38f76182dcc340b1dac76c7143b9fbd4ccc0f05b.zip
sdk-38f76182dcc340b1dac76c7143b9fbd4ccc0f05b.tar.gz
sdk-38f76182dcc340b1dac76c7143b9fbd4ccc0f05b.tar.bz2
Merge "SDK: fix win-sdk build errors, make future errors fatal." into readonly-korg-master
-rwxr-xr-xbuild/patch_windows_sdk.sh10
1 files changed, 7 insertions, 3 deletions
diff --git a/build/patch_windows_sdk.sh b/build/patch_windows_sdk.sh
index bee15ce..2bbf24c 100755
--- a/build/patch_windows_sdk.sh
+++ b/build/patch_windows_sdk.sh
@@ -1,14 +1,18 @@
#!/bin/bash
-# This file is included by development.git/tools/build/patch_windows_sdk.sh.
+# This file is run by development/tools/build/windows_sdk.mk right
+# after development.git/tools/build/patch_windows_sdk.sh.
# Please see the details in the other file.
+set -e # any error stops the build
# Verbose by default. Use -q to make more silent.
-V="-v"
+V=""
if [[ "$1" == "-q" ]]; then
- V=""
shift
+else
+ echo "Win SDK: $0 $*"
+ set -x # show bash commands; no need for V=-v
fi
TEMP_SDK_DIR=$1