diff options
| author | Brent Cook <busterb@gmail.com> | 2020-03-26 19:01:20 -0500 |
|---|---|---|
| committer | Brent Cook <busterb@gmail.com> | 2020-03-26 19:01:20 -0500 |
| commit | 81e279b69149ecffdb3e7adff789e9031d5d5683 (patch) | |
| tree | 8d801f7e6dde7f609d72155a843498c6f813a2ad /scripts | |
| parent | d62235af8132fbce5cc320eae295aab1c177c128 (diff) | |
| parent | 6edfcc97dd6a5e349cd1aadc415b5a1889820215 (diff) | |
| download | portable-81e279b69149ecffdb3e7adff789e9031d5d5683.tar.gz portable-81e279b69149ecffdb3e7adff789e9031d5d5683.tar.bz2 portable-81e279b69149ecffdb3e7adff789e9031d5d5683.zip | |
Land #575, fix android build
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/travis | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/travis b/scripts/travis index 3e794e7..88e40eb 100755 --- a/scripts/travis +++ b/scripts/travis | |||
| @@ -97,11 +97,10 @@ elif [ "x$ARCH" = "xarm32" -o "x$ARCH" = "xarm64" ]; then | |||
| 97 | file apps/openssl/.libs/openssl | 97 | file apps/openssl/.libs/openssl |
| 98 | 98 | ||
| 99 | elif [ "x$ARCH" = "xandroid" ]; then | 99 | elif [ "x$ARCH" = "xandroid" ]; then |
| 100 | touch $HOME/.android/repositories.cfg | ||
| 100 | echo y | sdkmanager 'ndk-bundle' | 101 | echo y | sdkmanager 'ndk-bundle' |
| 102 | echo y | sdkmanager 'ndk;20.1.5948944' | ||
| 101 | echo y | sdkmanager 'cmake;3.6.4111459' | 103 | echo y | sdkmanager 'cmake;3.6.4111459' |
| 102 | echo y | sdkmanager 'lldb;3.0' | ||
| 103 | echo y | sdkmanager --update | ||
| 104 | echo y | sdkmanager --licenses | ||
| 105 | 104 | ||
| 106 | export CMAKE=$ANDROID_HOME/cmake/3.6.4111459/bin/cmake | 105 | export CMAKE=$ANDROID_HOME/cmake/3.6.4111459/bin/cmake |
| 107 | export NINJA=$ANDROID_HOME/cmake/3.6.4111459/bin/ninja | 106 | export NINJA=$ANDROID_HOME/cmake/3.6.4111459/bin/ninja |