diff options
| author |  Lukacs Berki <lberki@google.com> | 2015-09-04 12:46:10 +0000 |
|---|---|---|
| committer |  Dmitry Lomov <dslomov@google.com> | 2015-09-04 12:53:27 +0000 |
| commit | a22f161d904c19169e45529d9262bda4b0c15c91 (patch) | |
| tree | cf1c7bc15b9b73be4559d6b42dc90c65dc6f7750 /src/main | |
| parent | 3ab82f767981c5bb32e041a3d08b8dc9f41625e2 (diff) | |
Description redacted.
--
MOS_MIGRATED_REVID=102334216
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt index cb883c82ce..98833add25 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt @@ -49,7 +49,7 @@ filegroup( outs = [tool + "_runner.sh"], srcs = [], cmd = "\n".join(["cat > $@ << 'EOF'", - "#!/bin/bash -e", + "#!/bin/bash -eu", "BINARY=$${0##*-out/host/bin/}", "DIRNAME=$$(dirname $$BINARY)", "SDK=$${0}.runfiles/$${DIRNAME}", @@ -130,11 +130,11 @@ genrule( srcs = [], outs = ["apkbuilder_binary.sh"], cmd = "\n".join(["cat > $@ << 'EOF'", - "#!/bin/bash -e", + "#!/bin/bash -eu", "BINARY=$${0##*-out/host/bin/}", "DIRNAME=$$(dirname $$BINARY)", "APKBUILDER=$${0}.runfiles/$${DIRNAME}/apkbuilder", - "if [[ \"$$KEYSTORE\" != \"\" ]]; then", + "if [[ -n \"$${KEYSTORE-}\" ]]; then", " mkdir -p /tmp/keystore/.android", " cp $$KEYSTORE /tmp/keystore/.android/debug.keystore", " export ANDROID_SDK_HOME=/tmp/keystore", |