diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-07-30 20:03:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-30 20:03:08 +0200 |
| commit | 5544ea4a178bc788c6b1ca5dd25dbc36ad14c072 (patch) | |
| tree | 807b90e649c6372781428917c9dba2cd52425384 | |
| parent | c9a1a69ad67d1d270627d11cb095d5bafb1beeb1 (diff) | |
| parent | 2da1614bebad0dd9a2e5b85c1350d9705e85fc68 (diff) | |
Merge pull request #30966 from akien-mga/android-remove-stl-no
Android: Remove unusable android_stl=no option
| -rw-r--r-- | platform/android/detect.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/platform/android/detect.py b/platform/android/detect.py index 4c5c70717b..283791f336 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -28,7 +28,6 @@ def get_opts(): ('ndk_platform', 'Target platform (android-<api>, e.g. "android-18")', "android-18"), EnumVariable('android_arch', 'Target architecture', "armv7", ('armv7', 'arm64v8', 'x86', 'x86_64')), BoolVariable('android_neon', 'Enable NEON support (armv7 only)', True), - BoolVariable('android_stl', 'Enable Android STL support (for modules)', True) ] @@ -207,11 +206,13 @@ def configure(env): ## Compile flags + env.Append(CPPFLAGS=["-isystem", env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/llvm-libc++/include"]) + env.Append(CPPFLAGS=["-isystem", env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/llvm-libc++abi/include"]) + env.Append(CXXFLAGS=["-std=gnu++14"]) + # Disable exceptions and rtti on non-tools (template) builds - if env['tools'] or env['android_stl']: - env.Append(CPPFLAGS=["-isystem", env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/llvm-libc++/include"]) - env.Append(CPPFLAGS=["-isystem", env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/llvm-libc++abi/include"]) - env.Append(CXXFLAGS=['-frtti', "-std=gnu++14"]) + if env['tools']: + env.Append(CXXFLAGS=['-frtti']) else: env.Append(CXXFLAGS=['-fno-rtti', '-fno-exceptions']) # Don't use dynamic_cast, necessary with no-rtti. |