Skip to content

Commit

Permalink
Merge pull request #1021 from Deniskore/protobuf_fix
Browse files Browse the repository at this point in the history
Fixed protobuf cpp
  • Loading branch information
inclement authored Mar 25, 2017
2 parents 395c7e0 + ad8573d commit 2952f5d
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion pythonforandroid/recipes/protobuf_cpp/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from pythonforandroid.recipe import PythonRecipe
from pythonforandroid.logger import shprint
from pythonforandroid.util import current_directory
from pythonforandroid.util import current_directory, shutil
from pythonforandroid.util import ensure_dir
from os.path import exists, join, dirname
import sh
from multiprocessing import cpu_count
Expand Down Expand Up @@ -37,6 +38,10 @@ def build_arch(self, arch):
shprint(sh.make, 'libprotobuf.la', '-j'+str(cpu_count()), _env=env)
shprint(sh.cp, '.libs/libprotobuf.a', join(self.ctx.get_libs_dir(arch.arch), 'libprotobuf.a'))

# Copy stl library
shutil.copyfile(self.ctx.ndk_dir + '/sources/cxx-stl/gnu-libstdc++/' + self.ctx.toolchain_version + '/libs/' + arch.arch + '/libgnustl_shared.so',
join(self.ctx.get_libs_dir(arch.arch), 'libgnustl_shared.so'))

# Build python bindings and _message.so
with current_directory(join(self.get_build_dir(arch.arch), 'python')):
hostpython = sh.Command(self.hostpython_location)
Expand Down

0 comments on commit 2952f5d

Please sign in to comment.