Add Support for NDK r18

RGPaul · Sep 19, 2018 · f20b4d6 · f20b4d6
1 parent c1fea3e
commit f20b4d6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -21,8 +21,9 @@ To compile Boost for Android you may use one of the following NDKs:
 | r8d from the [official android repository](http://developer.android.com).                 |   |   | x | x |   |   |   |   |
 | 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 |   |
+| r16 from the [official android repository](http://developer.android.com).                 |   |   |   |   | x | x | x | x |
 | r17b from the [official android repository](http://developer.android.com).                |   |   |   |   |   |   | x | x |
+| r18 from the [official android repository](http://developer.android.com).                 |   |   |   |   |   |   |   | x |
 
 # Quick Start
 

diff --git a/build-android.sh b/build-android.sh
@@ -294,16 +294,11 @@ case "$NDK_RN" in
 		CXXPATH=$AndroidNDKRoot/toolchains/${TOOLCHAIN}/prebuilt/${PlatformOS}-x86_64/bin/arm-linux-androideabi-g++
 		TOOLSET=gcc-androidR8e
 		;;
-	16.*)
+	"16.0"|"16.1"|"17.1"|"18.0")
 		TOOLCHAIN=${TOOLCHAIN:-llvm}
 		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
@@ -318,8 +313,8 @@ if [ -z "${ARCHLIST}" ]; then
   if [ "$TOOLSET" = "clang" ]; then
 
     case "$NDK_RN" in
-      # NDK 17: Support for ARMv5 (armeabi), MIPS, and MIPS64 has been removed.
-      17.*)
+      # NDK 17+: Support for ARMv5 (armeabi), MIPS, and MIPS64 has been removed.
+      "17.1"|"18.0")
         ARCHLIST="arm64-v8a armeabi-v7a x86 x86_64"
         ;;
       *)