Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update NDK to r18b, as that's what's in Pipelines. #931

Merged
merged 4 commits into from
Oct 24, 2018
Merged

Update NDK to r18b, as that's what's in Pipelines. #931

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f86db94
Update NDK to r18b, as that's what's in Pipelines.
BillyONeal Oct 24, 2018
eaa373c
WIP
BillyONeal Oct 24, 2018
2cc9951
WIP
BillyONeal Oct 24, 2018
07f77af
WIP
BillyONeal Oct 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Build_android/configure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

# -----------------
Expand Down Expand Up @@ -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 \
Expand Down