diff options
| author | Brad Leege <bleege@gmail.com> | 2015-09-23 09:49:53 -0500 |
|---|---|---|
| committer | Brad Leege <bleege@gmail.com> | 2015-09-23 09:49:53 -0500 |
| commit | 888444cc41aeb2a19c25a4202aa4adc14e5dc026 (patch) | |
| tree | 64250abf948d51bbcbcf7ffbc9cd7017c1c45b44 /scripts | |
| parent | 8cf927f6c423ad5e5ce9c8931002ee1c1dce1d9d (diff) | |
| parent | 4e885d600a4776d087c8c0e94719df9e45293408 (diff) | |
| download | qtlocation-mapboxgl-888444cc41aeb2a19c25a4202aa4adc14e5dc026.tar.gz | |
Merge branch 'android-curl'
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/android/configure.sh | 2 | ||||
| -rw-r--r-- | scripts/android/defaults.mk | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/scripts/android/configure.sh b/scripts/android/configure.sh index 70c8973a8b..5e5a9034c1 100644 --- a/scripts/android/configure.sh +++ b/scripts/android/configure.sh @@ -1,6 +1,8 @@ #!/usr/bin/env bash BOOST_VERSION=1.57.0 +LIBCURL_VERSION=7.40.0 +OPENSSL_VERSION=1.0.1l LIBPNG_VERSION=1.6.16 JPEG_VERSION=v9a SQLITE_VERSION=3.8.8.1 diff --git a/scripts/android/defaults.mk b/scripts/android/defaults.mk index 29f047c887..436f9db710 100644 --- a/scripts/android/defaults.mk +++ b/scripts/android/defaults.mk @@ -1,7 +1,7 @@ HEADLESS ?= none PLATFORM ?= android ASSET ?= zip -HTTP ?= android +HTTP ?= curl CACHE ?= sqlite GYP_FLAVOR_SUFFIX=-android |