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

Updated Boost-for-Android changes for r17b #1

Merged
merged 3 commits into from
Aug 1, 2018
Merged

Updated Boost-for-Android changes for r17b #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1831fd2
Merge pull request #133 from MModal/master
pelya May 30, 2018
870f6a4
Add Support for NDK r17b
RGPaul Jun 13, 2018
7f7255c
Merge pull request #137 from Manromen/master
pelya Jun 13, 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
7 changes: 7 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ To compile Boost for Android you may use one of the following NDKs:
| r8e from the [official android repository](http://developer.android.com). | | | x | x | | | |
| r10 from the [official android repository](http://developer.android.com). | | | x | x | | | |
| r16 from the [official android repository](http://developer.android.com). | | | | | x | x | x |
| r17b from the [official android repository](http://developer.android.com). | | | | | | | x |

# Quick Start

Expand Down Expand Up @@ -99,3 +100,9 @@ add full path to the gnustl_static library to the link paths. Example:
LOCAL_LDLIBS += lboost_system-gcc-md lboost_thread-gcc-md \
-L$(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/libs/armeabi \
-lgnustl_static

### NDK 17 (official)

Support for ARMv5 (armeabi), MIPS, and MIPS64 has been removed. Attempting to build any of these ABIs will result in an error.
This project will exclude these architectures for compiling with NDK 17.

17 changes: 15 additions & 2 deletions build-android.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,11 @@ case "$NDK_RN" in
CXXPATH=$AndroidNDKRoot/toolchains/${TOOLCHAIN}/prebuilt/${PlatformOS}-x86_64/bin/clang++
TOOLSET=clang
;;
17.*)
TOOLCHAIN=${TOOLCHAIN:-llvm}
CXXPATH=$AndroidNDKRoot/toolchains/${TOOLCHAIN}/prebuilt/${PlatformOS}-x86_64/bin/clang++
TOOLSET=clang
;;
*)
echo "Undefined or not supported Android NDK version: $NDK_RN"
exit 1
Expand All @@ -305,9 +310,17 @@ if [ -n "${AndroidSourcesDetected}" -a "${TOOLSET}" '!=' "clang" ]; then # Overw
fi

if [ -z "${ARCHLIST}" ]; then
ARCHLIST=armeabi
ARCHLIST=armeabi-v7a
if [ "$TOOLSET" = "clang" ]; then
ARCHLIST="arm64-v8a armeabi armeabi-v7a mips mips64 x86 x86_64"

case "$NDK_RN" in
# NDK 17: Support for ARMv5 (armeabi), MIPS, and MIPS64 has been removed.
17.*)
ARCHLIST="arm64-v8a armeabi-v7a x86 x86_64"
;;
*)
ARCHLIST="arm64-v8a armeabi armeabi-v7a mips mips64 x86 x86_64"
esac
fi
fi

Expand Down