Permalink
Browse files

Merge pull request #10371 from hrydgard/switch-android-stl

From NDK 16, libc++ is out of beta and gnustl will be deprecated soon, so make the switch.
  • Loading branch information...
hrydgard committed Dec 7, 2017
2 parents 3eda310 + 1076e35 commit c268e37818e3c096bdf8ea6637a627250a6f1de9
Showing with 3 additions and 3 deletions.
  1. +2 −2 android/build.gradle
  2. +1 −1 android/jni/Application.mk
@@ -109,7 +109,7 @@ android {
'-DANDROID_PLATFORM=android-15',
'-DANDROID_TOOLCHAIN=clang',
'-DANDROID_CPP_FEATURES=',
'-DANDROID_STL=gnustl_static',
'-DANDROID_STL=c++_static',
'-DANDROID_ARM_NEON=TRUE'
}
}
@@ -124,7 +124,7 @@ android {
'-DANDROID_PLATFORM=android-15',
'-DANDROID_TOOLCHAIN=clang',
'-DANDROID_CPP_FEATURES=',
'-DANDROID_STL=gnustl_static',
'-DANDROID_STL=c++_static',
'-DANDROID_ARM_NEON=TRUE',
'-DGOLD=TRUE'
}
@@ -1,4 +1,4 @@
APP_STL := gnustl_static
APP_STL := c++_static
APP_PLATFORM := android-9
APP_ABI := arm64-v8a armeabi-v7a x86 x86_64
APP_GNUSTL_CPP_FEATURES := exceptions

1 comment on commit c268e37

@hrydgard

This comment has been minimized.

Owner

hrydgard commented on c268e37 Dec 8, 2017

Wonderful build error:

clang: error: unable to execute command: Segmentation fault (core dumped)
clang: error: clang frontend command failed due to signal (use -v to see invocation)
Android clang version 3.8.256229  (based on LLVM 3.8.256229
Please sign in to comment.