diff options
| author | Brad Leege <bleege@gmail.com> | 2015-09-23 09:49:53 -0500 |
|---|---|---|
| committer | Brad Leege <bleege@gmail.com> | 2015-09-23 09:49:53 -0500 |
| commit | 888444cc41aeb2a19c25a4202aa4adc14e5dc026 (patch) | |
| tree | 64250abf948d51bbcbcf7ffbc9cd7017c1c45b44 /android | |
| parent | 8cf927f6c423ad5e5ce9c8931002ee1c1dce1d9d (diff) | |
| parent | 4e885d600a4776d087c8c0e94719df9e45293408 (diff) | |
| download | qtlocation-mapboxgl-888444cc41aeb2a19c25a4202aa4adc14e5dc026.tar.gz | |
Merge branch 'android-curl'
Diffstat (limited to 'android')
| -rw-r--r-- | android/mapboxgl-app.gypi | 5 |
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' |