summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorLeith Bade <leith@mapbox.com>2015-09-22 10:06:32 +1000
committerBrad Leege <bleege@gmail.com>2015-09-23 11:09:25 -0500
commit9e96e4e94b5f879b65e64b4baacda4662f8d58ac (patch)
treed2000cc0c6e18af5e0bee756d66e8e98771792b2 /android
parent19e7d154bb540302339eb984f5350c20e9001020 (diff)
downloadqtlocation-mapboxgl-9e96e4e94b5f879b65e64b4baacda4662f8d58ac.tar.gz
Restore libcurl HTTP on Android
Diffstat (limited to 'android')
-rw-r--r--android/mapboxgl-app.gypi5
1 files changed, 5 insertions, 0 deletions
diff --git a/android/mapboxgl-app.gypi b/android/mapboxgl-app.gypi
index 5731d21f85..7a8c52d5b6 100644
--- a/android/mapboxgl-app.gypi
+++ b/android/mapboxgl-app.gypi
@@ -25,6 +25,8 @@
'<@(boost_cflags)',
],
'libraries': [
+ '<@(openssl_static_libs)',
+ '<@(libcurl_static_libs)',
'<@(libpng_static_libs)',
'<@(jpeg_static_libs)',
'<@(sqlite_static_libs)',
@@ -43,6 +45,8 @@
'<@(libpng_ldflags)',
'<@(jpeg_ldflags)',
'<@(sqlite_ldflags)',
+ '<@(openssl_ldflags)',
+ '<@(libcurl_ldflags)',
'<@(zlib_ldflags)',
'<@(libzip_ldflags)',
],
@@ -70,6 +74,7 @@
'copies': [
{
'files': [
+ '../common/ca-bundle.crt',
'../styles/styles'
],
'destination': '<(pwd)/../android/java/MapboxGLAndroidSDK/src/main/assets'