From f86db942cd0335924347d6c4fde6ab806af61b7d Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 23 Oct 2018 18:50:42 -0700 Subject: [PATCH 1/4] Update NDK to r18b, as that's what's in Pipelines. --- Build_android/configure.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Build_android/configure.sh b/Build_android/configure.sh index 7dd6d8cf82..6abe711c9b 100755 --- a/Build_android/configure.sh +++ b/Build_android/configure.sh @@ -13,7 +13,7 @@ set -e -# The Android NDK r10e or later may work, but we test with r17c. To download, see the following link: +# The Android NDK r10e or later may work, but we test with r18b. To download, see the following link: # https://developer.android.com/ndk/downloads/index.html # ----------------- @@ -24,7 +24,7 @@ DO_BOOST=1 DO_OPENSSL=1 DO_CPPRESTSDK=1 -BOOSTVER=1.65.1 +BOOSTVER=1.68.0 OPENSSLVER=1.0.2k API=15 @@ -143,7 +143,7 @@ if [ "${DO_OPENSSL}" == "1" ]; then ( if [ "${DO_BOOST}" == "1" ]; then ( if [ ! -d 'Boost-for-Android' ]; then git clone https://github.com/moritz-wundke/Boost-for-Android; fi cd Boost-for-Android - git checkout 1bd9aa13463be4553b1146d6a5916566c2fba69c + git checkout 84973078a3d7668067d422d4654696ef59ab9d6d PATH="$PATH:$NDK_DIR" \ CXXFLAGS="-std=gnu++11" \ ./build-android.sh \ From eaa373cb2786ac51ade96fab0c36a1f1382af95a Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 23 Oct 2018 22:26:39 -0700 Subject: [PATCH 2/4] WIP --- Build_android/configure.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Build_android/configure.sh b/Build_android/configure.sh index 6abe711c9b..f95f7afe35 100755 --- a/Build_android/configure.sh +++ b/Build_android/configure.sh @@ -24,7 +24,7 @@ DO_BOOST=1 DO_OPENSSL=1 DO_CPPRESTSDK=1 -BOOSTVER=1.68.0 +BOOSTVER=1.67.0 OPENSSLVER=1.0.2k API=15 From 2cc99516cf2348b233cd67c701d209a0fdd4ec63 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 23 Oct 2018 22:42:54 -0700 Subject: [PATCH 3/4] WIP --- Build_android/configure.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Build_android/configure.sh b/Build_android/configure.sh index f95f7afe35..d565a2d8df 100755 --- a/Build_android/configure.sh +++ b/Build_android/configure.sh @@ -24,7 +24,7 @@ DO_BOOST=1 DO_OPENSSL=1 DO_CPPRESTSDK=1 -BOOSTVER=1.67.0 +BOOSTVER=1.66.0 OPENSSLVER=1.0.2k API=15 From 07f77af113ce27a34def2e5b7bbea484010263df Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 23 Oct 2018 23:00:41 -0700 Subject: [PATCH 4/4] WIP --- Build_android/configure.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Build_android/configure.sh b/Build_android/configure.sh index d565a2d8df..13a7cfb02f 100755 --- a/Build_android/configure.sh +++ b/Build_android/configure.sh @@ -24,7 +24,7 @@ DO_BOOST=1 DO_OPENSSL=1 DO_CPPRESTSDK=1 -BOOSTVER=1.66.0 +BOOSTVER=1.65.1 OPENSSLVER=1.0.2k API=15