diff options
| author | Leith Bade <leith@mapbox.com> | 2015-07-31 13:00:52 +1000 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2015-08-11 11:59:08 +1000 |
| commit | 0cbe7e07f5ada444de45b3936f7378dd4f3b9d6b (patch) | |
| tree | 72e2e56f37659d9b55b2815ed9aa8a1e363c1184 /scripts | |
| parent | dc11b8132ba7ccc58c280e580526425e7389df86 (diff) | |
| download | qtlocation-mapboxgl-0cbe7e07f5ada444de45b3936f7378dd4f3b9d6b.tar.gz | |
Use OkHTTP to implement HTTPContext on Android.
Closes #823
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/android/configure.sh | 4 | ||||
| -rw-r--r-- | scripts/android/defaults.mk | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/scripts/android/configure.sh b/scripts/android/configure.sh index 667ea68911..70c8973a8b 100644 --- a/scripts/android/configure.sh +++ b/scripts/android/configure.sh @@ -1,8 +1,6 @@ #!/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 @@ -11,4 +9,4 @@ ZLIB_VERSION=system NUNICODE_VERSION=1.5.1 LIBZIP_VERSION=0.11.2 -export MASON_ANDROID_ABI=${MASON_PLATFORM_VERSION}
\ No newline at end of file +export MASON_ANDROID_ABI=${MASON_PLATFORM_VERSION} 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 |