From 77f4b60b592a11c7a63b3387691854de4a61e40c Mon Sep 17 00:00:00 2001 From: opacam Date: Mon, 22 Oct 2018 12:59:22 +0200 Subject: [PATCH] Fix python2 (no openssl) Also fix architecture for python2 test to avoid unsupported api errors. It seems that newer openssl libraries (1.1) are incompatible with python 2.7.2. --- pythonforandroid/recipes/python2/__init__.py | 11 +++++++++++ testapps/setup_testapp_python2.py | 1 + 2 files changed, 12 insertions(+) diff --git a/pythonforandroid/recipes/python2/__init__.py b/pythonforandroid/recipes/python2/__init__.py index 919f5e59db..d6b569bf47 100644 --- a/pythonforandroid/recipes/python2/__init__.py +++ b/pythonforandroid/recipes/python2/__init__.py @@ -2,7 +2,10 @@ from pythonforandroid.toolchain import shprint, current_directory, info from pythonforandroid.patching import (is_darwin, is_api_gt, check_all, is_api_lt, is_ndk) +from pythonforandroid.bootstraps.sdl2 import EXCLUDE_EXTS from os.path import exists, join, realpath +from os import walk +import glob import sh @@ -170,6 +173,14 @@ def do_python_build(self, arch): # print('python2 build done, exiting for debug') # exit(1) + def include_root(self, arch_name): + return join(self.get_build_dir(arch_name), + 'python-install', 'include', 'python2.7') + + def link_root(self, arch_name): + return join(self.get_build_dir(arch_name), + 'python-install', 'lib') + def create_python_bundle(self, dirn, arch): info("Filling private directory") if not exists(join(dirn, "lib")): diff --git a/testapps/setup_testapp_python2.py b/testapps/setup_testapp_python2.py index b54186f423..1d2832a29a 100644 --- a/testapps/setup_testapp_python2.py +++ b/testapps/setup_testapp_python2.py @@ -9,6 +9,7 @@ 'dist-name': 'bdisttest_python2', 'ndk-version': '10.3.2', 'permission': 'VIBRATE', + 'arch': 'armeabi-v7a', 'window': None, }}