Merge pull request kivy#1757 from goffi-contrib/protobuf_runtime_fix

AndreMiras · web-flow · commit 2f4cf9136978 · 2019-03-16T20:38:20.000+01:00
[protobuf_cpp] fixed runtime issues
diff --git a/pythonforandroid/recipes/protobuf_cpp/__init__.py b/pythonforandroid/recipes/protobuf_cpp/__init__.py
@@ -98,6 +98,10 @@ def build_arch(self, arch):
         # Install python bindings
         self.install_python_package(arch)
 
+        # Create __init__.py which is missing (cf. https://github.com/protocolbuffers/protobuf/issues/1296
+        # and https://stackoverflow.com/questions/13862562/google-protocol-buffers-not-found-when-trying-to-freeze-python-app)
+        open(join(self.ctx.get_site_packages_dir(), 'google', '__init__.py'), 'a').close()
+
     def install_python_package(self, arch):
         env = self.get_recipe_env(arch)
 
@@ -132,11 +136,10 @@ def get_recipe_env(self, arch):
         env['CXXFLAGS'] += ' -frtti'
         env['CXXFLAGS'] += ' -fexceptions'
         env['LDFLAGS'] += (
+            ' -lgnustl_shared -landroid -llog' +
             ' -L' + self.ctx.ndk_dir +
             '/sources/cxx-stl/gnu-libstdc++/' + self.ctx.toolchain_version +
             '/libs/' + arch.arch)
-        env['LIBS'] = env.get('LIBS', '') + ' -lgnustl_shared -landroid -llog'
-
         return env
 
 
