LBRYCommunity/lbry-android-sdk
1
0
Fork 0
Code Issues 1 Pull requests 5 Projects Releases 26 Packages Wiki Activity

Upgrade p4a #19

Open
jessopb wants to merge 36 commits from upgrade_p4a into master
pull from: upgrade_p4a
merge into: LBRYCommunity:master
Conversation 0 Commits 36 Files changed 3445 +2 -2
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 717d3805b2 - Show all commits

2
p4a/pythonforandroid/bootstraps/lbry/__init__.py
View file

@ -18,7 +18,7 @@ class LbryBootstrap(Bootstrap):
info_main("# Creating Android project ({})".format(self.name)) info_main("# Creating Android project ({})".format(self.name))
arch = self.ctx.archs[0] arch = self.ctx.archs[0]
python_install_dir = self.ctx.get_python_install_dir() python_install_dir = self.ctx.get_python_install_dir(arch.arch)
#from_crystax = self.ctx.python_recipe.from_crystax #from_crystax = self.ctx.python_recipe.from_crystax
#crystax_python_dir = join("crystax_python", "crystax_python") #crystax_python_dir = join("crystax_python", "crystax_python")

2
recipes/coincurve/__init__.py
View file

@ -31,7 +31,7 @@ class CoincurveRecipe(CompiledComponentsPythonRecipe):
# https://github.com/kivy/python-for-android/pull/1250/files#diff-569e13021e33ced8b54385f55b49cbe6 # https://github.com/kivy/python-for-android/pull/1250/files#diff-569e13021e33ced8b54385f55b49cbe6
env['CFLAGS'] += ' -I{}/include/python/'.format(ndk_dir_python) env['CFLAGS'] += ' -I{}/include/python/'.format(ndk_dir_python)
else: else:
env['PYTHON_ROOT'] = self.ctx.get_python_install_dir() env['PYTHON_ROOT'] = self.ctx.get_python_install_dir(arch.arch)
env['CFLAGS'] += ' -I' + env['PYTHON_ROOT'] + '/include/python{}'.format(python_version) env['CFLAGS'] += ' -I' + env['PYTHON_ROOT'] + '/include/python{}'.format(python_version)
env['LDFLAGS'] += " -lpython{}".format(python_version) env['LDFLAGS'] += " -lpython{}".format(python_version)
env['LDFLAGS'] += " -lsecp256k1" env['LDFLAGS'] += " -lsecp256k1"