Added call_ndk_build to ndk recipe

inclement · inclement · commit 5910c2c2ac07 · 2015-12-13T22:13:52.000Z
diff --git a/pythonforandroid/recipe.py b/pythonforandroid/recipe.py
@@ -562,6 +562,8 @@ class NDKRecipe(Recipe):
 
     dir_name = None  # The name of the recipe build folder in the jni dir
 
+    call_ndk_build = False  # If True, call ndk-build with this target
+
     def get_build_container_dir(self, arch):
         return self.get_jni_dir()
 
@@ -574,6 +576,14 @@ def get_build_dir(self, arch):
     def get_jni_dir(self):
         return join(self.ctx.bootstrap.build_dir, 'jni')
 
+    def build_arch(self, arch):
+        if not self.call_ndk_build:
+            return
+
+        env = self.get_recipe_env(arch)
+        with current_directory(self.get_build_container_dir(arch)):
+            shprint(sh.ndk_build, "V=1", self.dir_name, _env=env)
+
 
 class PythonRecipe(Recipe):
     site_packages_name = None
@@ -674,7 +684,7 @@ def build_compiled_components(self, arch):
             hostpython = sh.Command(self.hostpython_location)
             if self.call_hostpython_via_targetpython:
                 shprint(hostpython, 'setup.py', 'build_ext', '-v',
-                        *self.setup_extra_args)
+                        *self.setup_extra_args, _env=env)
             else:
                 hppath = join(dirname(self.hostpython_location), 'Lib',
                               'site-packages')
diff --git a/pythonforandroid/recipes/freetype_ndk/__init__.py b/pythonforandroid/recipes/freetype_ndk/__init__.py
@@ -10,5 +10,7 @@ class Freetype(NDKRecipe):
 
     patches = []
 
+    call_ndk_build = True
+
 
 recipe = Freetype()
diff --git a/pythonforandroid/recipes/png/__init__.py b/pythonforandroid/recipes/png/__init__.py
@@ -9,5 +9,7 @@ class Libpng(NDKRecipe):
 
     patches = []
 
+    call_ndk_build = True
+
 
 recipe = Libpng()
