Migrate to PyProjectRecipe

Author: kengoon

pythonforandroid/recipes/grpcio/__init__.py

@@ -1,46 +1,28 @@
-import glob
-from logging import info
+from pythonforandroid.recipe import PyProjectRecipe, Recipe
 
-import sh
-from pythonforandroid.logger import shprint
-from pythonforandroid.recipe import CppCompiledComponentsPythonRecipe
-from pythonforandroid.util import current_directory
 
-
-class GrpcioRecipe(CppCompiledComponentsPythonRecipe):
+class GrpcioRecipe(PyProjectRecipe):
     version = '1.64.0'
     url = 'https://files.pythonhosted.org/packages/source/g/grpcio/grpcio-{version}.tar.gz'
     depends = ["setuptools", "librt", "libpthread"]
     patches = ["comment-getserverbyport-r-args.patch", "remove-android-log-write.patch"]
 
     def get_recipe_env(self, arch, **kwargs):
         env = super().get_recipe_env(arch, **kwargs)
-        env['NDKPLATFORM'] = "NOTNONE"
-        env['GRPC_PYTHON_BUILD_WITH_CYTHON'] = '1'
+        env["NDKPLATFORM"] = "NOTNONE"
+        env["GRPC_PYTHON_BUILD_SYSTEM_OPENSSL"] = "1"
+        env["GRPC_PYTHON_BUILD_SYSTEM_ZLIB"] = "1"
+        env["ZLIB_INCLUDE"] = self.ctx.ndk.sysroot_include_dir
+        # replace -I with a space
+        openssl_recipe = Recipe.get_recipe('openssl', self.ctx)
+        env["SSL_INCLUDE"] = openssl_recipe.include_flags(arch).strip().replace("-I", "")
         env["CFLAGS"] += " -U__ANDROID_API__"
         env["CFLAGS"] += " -D__ANDROID_API__={}".format(self.ctx.ndk_api)
-
         # turn off c++11 warning error of "invalid suffix on literal"
         env["CFLAGS"] += " -Wno-reserved-user-defined-literal"
-        env['PLATFORM'] = 'android'
+        env["PLATFORM"] = "android"
         env["LDFLAGS"] += " -llog -landroid"
         return env
 
-    def build_compiled_components(self, arch):
-        info('Building compiled components in {}'.format(self.name))
-
-        env = self.get_recipe_env(arch)
-        hostpython = sh.Command(self.hostpython_location)
-        with current_directory(self.get_build_dir(arch.arch)):
-            if self.install_in_hostpython:
-                shprint(hostpython, 'setup.py', 'clean', '--all', _env=env)
-            shprint(hostpython, 'setup.py', self.build_cmd, '-v',
-                    _env=env, *self.setup_extra_args)
-
-            # grpcio creates a build directory and names it `pyb`
-            build_dir = glob.glob('pyb/lib.*')[0]
-            shprint(sh.find, build_dir, '-name', '"*.o"', '-exec',
-                    env['STRIP'], '{}', ';', _env=env)
-
 
 recipe = GrpcioRecipe()

pythonforandroid/recipes/grpcio/use-ndk-zlib-and-openssl-recipe-include.patch

@@ -0,0 +1,16 @@
+--- a/setup.py	2024-05-31 11:20:56.824695569 +0100
++++ b/setup.py	2024-05-31 23:13:40.324392463 +0100
+@@ -299,11 +299,11 @@
+         lambda x: "third_party/boringssl" not in x, CORE_C_FILES
+     )
+     CORE_C_FILES = filter(lambda x: "src/boringssl" not in x, CORE_C_FILES)
+-    SSL_INCLUDE = (os.path.join("/usr", "include", "openssl"),)
++    SSL_INCLUDE = tuple(os.environ["SSL_INCLUDE"].split(" "))
+ 
+ if BUILD_WITH_SYSTEM_ZLIB:
+     CORE_C_FILES = filter(lambda x: "third_party/zlib" not in x, CORE_C_FILES)
+-    ZLIB_INCLUDE = (os.path.join("/usr", "include"),)
++    ZLIB_INCLUDE = tuple(os.environ["ZLIB_INCLUDE"].split(" "))
+ 
+ if BUILD_WITH_SYSTEM_CARES:
+     CORE_C_FILES = filter(lambda x: "third_party/cares" not in x, CORE_C_FILES)