diff options
| author |  Damien Martin-Guillerez <dmarting@google.com> | 2015-09-04 15:52:26 +0000 |
|---|---|---|
| committer | Damien Martin-Guillerez <dmarting@google.com> | 2015-09-04 16:32:59 +0000 |
| commit | b81f90cefb6d1b4c3260bb328b03f3659b09c32d (patch) | |
| tree | f9267d865bff8913dad4e3792cda98a3416cf1cf /compile.sh | |
| parent | 369635536db085dd70124ace2e4ef604680148b4 (diff) | |
Unbreak CI: the Android SDK test in compile.sh was wrong.
--
MOS_MIGRATED_REVID=102345101
Diffstat (limited to 'compile.sh')
| -rwxr-xr-x | compile.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/compile.sh b/compile.sh index a5598ef20c..3881bd741d 100755 --- a/compile.sh +++ b/compile.sh @@ -162,8 +162,9 @@ if [ $DO_TESTS ]; then new_step "Running tests" display "." - if [ "$(get_bind_target //external:android_ndk_repository)" = "//:dummy" - -o "$(get_bind_target //external:android_sdk_repository)" = "//:dummy" ]; then + ndk_target="$(get_bind_target //external:android_ndk_for_testing)" + sdk_target="$(get_bind_target //external:android_sdk_for_testing)" + if [ "$ndk_target" = "//:dummy" -o "$sdk_target" = "//:dummy" ]; then display "$WARNING Android SDK or NDK are not set in the WORKSPACE file. Android tests will not be run." fi |