diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-08-28 07:47:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-28 07:47:59 +0200 |
| commit | bec00110e0f9fa249a6148acc388aa4a84b04927 (patch) | |
| tree | c5d717d759d2ec448fe046a4b0f5b288e0cd6865 /platform/android/detect.py | |
| parent | ac38b7e97b3de082d87a65bed7b53b51e603fec0 (diff) | |
| parent | 3a3ea6d5147b303ee24299d4aa19e99f3131a6bd (diff) | |
Merge pull request #21510 from milkowski/master
No need to link with libandroid_support.a in NDK 17
Diffstat (limited to 'platform/android/detect.py')
| -rw-r--r-- | platform/android/detect.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/platform/android/detect.py b/platform/android/detect.py index b22e85b2c1..953a2fa6d2 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -258,9 +258,10 @@ def configure(env): if ndk_version != None and LooseVersion(ndk_version) >= LooseVersion("15.0.4075724"): if LooseVersion(ndk_version) >= LooseVersion("17.1.4828580"): env.Append(LINKFLAGS=['-Wl,--exclude-libs,libgcc.a','-Wl,--exclude-libs,libatomic.a','-nostdlib++']) + else: + 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(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+"/libc++_shared.so"]) else: env.Append(LINKFLAGS=['-shared', '--sysroot=' + lib_sysroot, '-Wl,--warn-shared-textrel']) |