unversion libssl and libcrypto

wexi · wexi · commit 25d303688ca0 · 2017-12-17T15:01:09.000-05:00
diff --git a/pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonUtil.java b/pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonUtil.java
@@ -41,8 +41,9 @@ protected static ArrayList<String> getLibraries(File filesDir) {
         libsList.add("SDL2_image");
         libsList.add("SDL2_mixer");
         libsList.add("SDL2_ttf");
-        addLibraryIfExists(libsList, "ssl.*", libsDir);
-        addLibraryIfExists(libsList, "crypto.*", libsDir);
+        addLibraryIfExists(libsList, "ssl", libsDir);
+        addLibraryIfExists(libsList, "crypto", libsDir);
+        addLibraryIfExists(libsList, "ffi", libsDir);
         libsList.add("python2.7");
         libsList.add("python3.5m");
         libsList.add("main");
diff --git a/pythonforandroid/recipe.py b/pythonforandroid/recipe.py
@@ -5,7 +5,6 @@
 import glob
 from shutil import rmtree
 from six import PY2, with_metaclass
-
 import hashlib
 from re import match
 
@@ -556,15 +555,15 @@ def clean_build(self, arch=None):
 
     def install_libs(self, arch, *libs, **links):
         libs_dir = self.ctx.get_libs_dir(arch.arch)
-        if not libs:
-            warning('install_libs called with no libraries to install!')
-            return
-        args = libs + (libs_dir,)
-        shprint(sh.cp, *args)
         if links:
-            with current_directory(libs_dir):
-                for lib, link in links.iteritems():
-                    shprint(sh.ln, '-s', lib, link)
+            for lib, link in links.iteritems():
+                shprint(sh.cp, lib, join(libs_dir, link))
+        else:
+            if not libs:
+                warning('install_libs called with no libraries to install!')
+                return
+            args = libs + (libs_dir,)
+            shprint(sh.cp, *args)
 
     def has_libs(self, arch, *libs):
         return all(map(lambda l: self.ctx.has_lib(arch.arch, l), libs))
