Переглянути джерело

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.

(cherry picked from commit 3a3ea6d5147b303ee24299d4aa19e99f3131a6bd)
Wojciech Milkowski 7 роки тому
батько
коміт
8a95782e5a
1 змінених файлів з 2 додано та 1 видалено
  1. 2 1
      platform/android/detect.py

+ 2 - 1
platform/android/detect.py

@@ -255,8 +255,9 @@ def configure(env):
         if env['android_stl'] == 'yes':
             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(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:
         if mt_link: