godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #30965 from akien-mga/3.0-android_stl-no 

Android: Restore support for android_stl=no builds
This commit is contained in:
Rémi Verschelde 2019-07-30 17:16:40 +02:00 committed by GitHub
parent d092798038 b87d819aad
commit 3b5837e4d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
platform/android/detect.py
View File

@ -214,6 +214,11 @@ def configure(env):
env.Append(CPPFLAGS=["-isystem", env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/llvm-libc++abi/include"]) env.Append(CPPFLAGS=["-isystem", env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/llvm-libc++abi/include"])
env.Append(CXXFLAGS=['-frtti',"-std=gnu++14"]) env.Append(CXXFLAGS=['-frtti',"-std=gnu++14"])
else: else:
# Bullet and Webm need STL, so they can't be used with this option.
if (env['module_bullet_enabled'] or env['module_webm_enabled']):
print("\nERROR: The `android_stl=no` option is not compatible with the bullet and webm modules.\n"
"If you want to use it, disable those modules with `module_bullet_enabled=no module_webm_enabled=no`.\n")
sys.exit(255)
env.Append(CXXFLAGS=['-fno-rtti', '-fno-exceptions', '-DNO_SAFE_CAST']) env.Append(CXXFLAGS=['-fno-rtti', '-fno-exceptions', '-DNO_SAFE_CAST'])
ndk_version = get_ndk_version(env["ANDROID_NDK_ROOT"]) ndk_version = get_ndk_version(env["ANDROID_NDK_ROOT"])
@ -264,17 +269,20 @@ def configure(env):
## Link flags ## Link flags
if ndk_version != None and LooseVersion(ndk_version) >= LooseVersion("15.0.4075724"): if ndk_version != None and LooseVersion(ndk_version) >= LooseVersion("15.0.4075724"):
if env['android_stl']:
if LooseVersion(ndk_version) >= LooseVersion("17.1.4828580"): if LooseVersion(ndk_version) >= LooseVersion("17.1.4828580"):
env.Append(LINKFLAGS=['-Wl,--exclude-libs,libgcc.a','-Wl,--exclude-libs,libatomic.a','-nostdlib++']) env.Append(LINKFLAGS=['-Wl,--exclude-libs,libgcc.a','-Wl,--exclude-libs,libatomic.a','-nostdlib++'])
else: else:
env.Append(LINKFLAGS=[env["ANDROID_NDK_ROOT"] +"/sources/cxx-stl/llvm-libc++/libs/"+arch_subpath+"/libandroid_support.a"]) env.Append(LINKFLAGS=[env["ANDROID_NDK_ROOT"] +"/sources/cxx-stl/llvm-libc++/libs/"+arch_subpath+"/libandroid_support.a"])
env.Append(LINKFLAGS=['-shared', '--sysroot=' + lib_sysroot, '-Wl,--warn-shared-textrel'])
env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/llvm-libc++/libs/"+arch_subpath+"/"]) env.Append(LIBPATH=[env["ANDROID_NDK_ROOT"] + "/sources/cxx-stl/llvm-libc++/libs/"+arch_subpath+"/"])
env.Append(LINKFLAGS=[env["ANDROID_NDK_ROOT"] +"/sources/cxx-stl/llvm-libc++/libs/"+arch_subpath+"/libc++_shared.so"]) env.Append(LINKFLAGS=[env["ANDROID_NDK_ROOT"] +"/sources/cxx-stl/llvm-libc++/libs/"+arch_subpath+"/libc++_shared.so"])
else: else:
env.Append(LINKFLAGS=['-shared', '--sysroot=' + lib_sysroot, '-Wl,--warn-shared-textrel']) # This is the legacy and minimal 'System STL' with support for basic features like new and delete
env.Append(LINKFLAGS=['-stdlib=libstdc++'])
else:
if mt_link: if mt_link:
env.Append(LINKFLAGS=['-Wl,--threads']) env.Append(LINKFLAGS=['-Wl,--threads'])
env.Append(LINKFLAGS=['-shared', '--sysroot=' + lib_sysroot, '-Wl,--warn-shared-textrel'])
if env["android_arch"] == "armv7": if env["android_arch"] == "armv7":
env.Append(LINKFLAGS='-Wl,--fix-cortex-a8'.split()) env.Append(LINKFLAGS='-Wl,--fix-cortex-a8'.split())