From e3517641d85f10d39908348b2fa94bdce803760e Mon Sep 17 00:00:00 2001 From: Leith Bade Date: Sat, 24 Oct 2015 11:52:03 +1100 Subject: [PATCH] [android] Fix TEXTREL dlopen error on Android 6.0 x86 Update libcurl to 7.45.0 and OpenSSL to 1.0.1p Fixes #2772 --- .mason | 2 +- scripts/android/configure.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.mason b/.mason index 36dc9282d..b30e09ebc 160000 --- a/.mason +++ b/.mason @@ -1 +1 @@ -Subproject commit 36dc9282d7b79b4533c511529d6f83fe5719f673 +Subproject commit b30e09ebc724b17cd000721938b3d26d3264900d diff --git a/scripts/android/configure.sh b/scripts/android/configure.sh index 54eccabd8..c2e2c834e 100644 --- a/scripts/android/configure.sh +++ b/scripts/android/configure.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash BOOST_VERSION=1.57.0 -LIBCURL_VERSION=7.40.0 -OPENSSL_VERSION=1.0.1l +LIBCURL_VERSION=7.45.0 +OPENSSL_VERSION=1.0.1p LIBPNG_VERSION=1.6.16 JPEG_VERSION=v9a SQLITE_VERSION=3.8.8.1