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

Jump to bottom

From NDK 16, libc++ is out of beta and gnustl will be deprecated soon, so make the switch. #10371

Merged
merged 2 commits into from Dec 7, 2017
Merged

From NDK 16, libc++ is out of beta and gnustl will be deprecated soon, so make the switch. #10371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18f9334
From NDK 16, libc++ is out of beta and gnustl will be deprecated soon…
hrydgard Dec 7, 2017
1076e35
Also update Application.mk for the old build system.
hrydgard Dec 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions android/build.gradle
View file
Open in desktop
Expand Up @@ -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'
}
}
Expand All @@ -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'
}
Expand Down
2 changes: 1 addition & 1 deletion android/jni/Application.mk
View file
Open in desktop
@@ -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
Expand Down