diff options
author | Leith Bade <leith@mapbox.com> | 2015-09-22 10:06:32 +1000 |
---|---|---|
committer | Brad Leege <bleege@gmail.com> | 2015-09-23 11:09:25 -0500 |
commit | 9e96e4e94b5f879b65e64b4baacda4662f8d58ac (patch) | |
tree | d2000cc0c6e18af5e0bee756d66e8e98771792b2 /scripts | |
parent | 19e7d154bb540302339eb984f5350c20e9001020 (diff) | |
download | qtlocation-mapboxgl-9e96e4e94b5f879b65e64b4baacda4662f8d58ac.tar.gz |
Restore libcurl HTTP on Android
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 |