Skip to content

Commit

Permalink
Add Support for NDK r20 (moritz-wundke#172)
Browse files Browse the repository at this point in the history
  • Loading branch information
RGPaul authored and pelya committed Jun 14, 2019
1 parent b1e2cb3 commit aed656a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ To compile Boost for Android you may use one of the following NDKs:
| r18b from the [official android repository](http://developer.android.com). | | | | | | | | x | x | x |
| r19 from the [official android repository](http://developer.android.com). | | | | | | | | | x | |
| r19c from the [official android repository](http://developer.android.com). | | | | | | | | | x | x |
| r20 from the [official android repository](http://developer.android.com). | | | | | | | | | | x |

For NDK from r4 to r10, GCC with gnustl_static runtime library is used, only ARM architecture is supported.

Expand Down
4 changes: 2 additions & 2 deletions build-android.sh
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ case "$NDK_RN" in
CXXPATH=$AndroidNDKRoot/toolchains/${TOOLCHAIN}/prebuilt/${PlatformOS}-x86_64/bin/clang++
TOOLSET=clang
;;
"19.0"|"19.1"|"19.2")
"19.0"|"19.1"|"19.2"|"20.0")
TOOLCHAIN=${TOOLCHAIN:-llvm}
CXXPATH=$AndroidNDKRoot/toolchains/${TOOLCHAIN}/prebuilt/${PlatformOS}-x86_64/bin/clang++
TOOLSET=clang
Expand All @@ -336,7 +336,7 @@ if [ -z "${ARCHLIST}" ]; then

case "$NDK_RN" in
# NDK 17+: Support for ARMv5 (armeabi), MIPS, and MIPS64 has been removed.
"17.1"|"17.2"|"18.0"|"18.1"|"19.0"|"19.1"|"19.2")
"17.1"|"17.2"|"18.0"|"18.1"|"19.0"|"19.1"|"19.2"|"20.0")
ARCHLIST="arm64-v8a armeabi-v7a x86 x86_64"
;;
*)
Expand Down

0 comments on commit aed656a

Please sign in to comment.