diff options
| author | Wojciech Milkowski <wmilkowski@interia.pl> | 2018-08-28 02:28:07 +0200 |
|---|---|---|
| committer | Wojciech Milkowski <wmilkowski@interia.pl> | 2018-08-28 02:34:59 +0200 |
| commit | 3a3ea6d5147b303ee24299d4aa19e99f3131a6bd (patch) | |
| tree | 494d4fcb0fcaaf0412eb09291a2795d02ed193e4 /platform/android | |
| parent | 02490dbd2c6e5d89c29eb14c7c4ff62d7e68986a (diff) | |
No need to link with libandroid_support in NDK 17
According to https://github.com/bytedeco/javacpp/pull/244 in NDK 17
libandroid_support library is not needed any more, and on armv8 is
already gone which breaks compilation.
Diffstat (limited to 'platform/android')
| -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']) |