diff options
| author | Leith Bade <leith@mapbox.com> | 2015-10-29 14:48:52 +1100 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2015-11-17 10:12:58 +1100 |
| commit | af2d034e9d1ea9d55d022025ce0f99005ca3af58 (patch) | |
| tree | b14d8c863a3d1dff7365fb36f44478bcbef46e5d /scripts | |
| parent | 43c6e2fb524808dcca5b858eda3e222c60447517 (diff) | |
| download | qtlocation-mapboxgl-af2d034e9d1ea9d55d022025ce0f99005ca3af58.tar.gz | |
[android] Bring back OkHTTP
Update http_request_android.cpp for changes in #2727
Fix crash caused by calling both onFailure and onReponse in the same request
Fixes #2856
Fixes #2400
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/android/configure.sh | 2 | ||||
| -rw-r--r-- | scripts/android/defaults.mk | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/scripts/android/configure.sh b/scripts/android/configure.sh index 2642584415..ff3d88b546 100644 --- a/scripts/android/configure.sh +++ b/scripts/android/configure.sh @@ -1,8 +1,6 @@ #!/usr/bin/env bash BOOST_VERSION=1.59.0 -LIBCURL_VERSION=7.45.0 -OPENSSL_VERSION=1.0.1p LIBPNG_VERSION=1.6.18 JPEG_VERSION=v9a SQLITE_VERSION=3.9.1 diff --git a/scripts/android/defaults.mk b/scripts/android/defaults.mk index 436f9db710..29f047c887 100644 --- a/scripts/android/defaults.mk +++ b/scripts/android/defaults.mk @@ -1,7 +1,7 @@ HEADLESS ?= none PLATFORM ?= android ASSET ?= zip -HTTP ?= curl +HTTP ?= android CACHE ?= sqlite GYP_FLAVOR_SUFFIX=-android |