Skip to content

Commit

Permalink
Fix python2 (no openssl)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
opacam committed Oct 22, 2018
1 parent 3b26a57 commit 77f4b60
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
11 changes: 11 additions & 0 deletions pythonforandroid/recipes/python2/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down Expand Up @@ -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")):
Expand Down
1 change: 1 addition & 0 deletions testapps/setup_testapp_python2.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
'dist-name': 'bdisttest_python2',
'ndk-version': '10.3.2',
'permission': 'VIBRATE',
'arch': 'armeabi-v7a',
'window': None,
}}

Expand Down

0 comments on commit 77f4b60

Please sign in to comment.