diff options
| author | Leith Bade <leith@mapbox.com> | 2015-09-22 10:06:32 +1000 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2015-09-22 16:40:54 +1000 |
| commit | 4e885d600a4776d087c8c0e94719df9e45293408 (patch) | |
| tree | c60e4b24da6227803fccf7081a18e580cf55db02 /scripts | |
| parent | feae692dbaefa51b893528a31139fb8282b3e889 (diff) | |
| download | qtlocation-mapboxgl-4e885d600a4776d087c8c0e94719df9e45293408.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 |