Made android recipe work

Author: inclement

recipes/android/__init__.py

@@ -1,6 +1,7 @@
 
-from toolchain import PythonRecipe, shprint, ensure_dir
+from toolchain import PythonRecipe, shprint, ensure_dir, current_directory, ArchAndroid
 import sh
+from os.path import exists, join
 
 
 class AndroidRecipe(PythonRecipe):
@@ -12,6 +13,26 @@ class AndroidRecipe(PythonRecipe):
     def prebuild_armeabi(self):
         shprint(sh.cp, '-a', self.get_recipe_dir() + '/src', self.get_build_dir('armeabi'))
 
+    def build_armeabi(self):
+
+        with current_directory(join(self.get_build_dir('armeabi'), 'src')):
+            if exists('.done'):
+                print('android module already compiled, exiting')
+                return
+
+            env = ArchAndroid(self.ctx).get_env()
+
+            env['LDFLAGS'] = env['LDFLAGS'] + ' -L{}'.format(self.ctx.libs_dir)
+            env['LDSHARED'] = env['LIBLINK']
+
+            shprint(sh.find, '.', '-iname', '*.pyx', '-exec', self.ctx.cython, '{}', ';')
+
+            hostpython = sh.Command(self.ctx.hostpython)
+            shprint(hostpython, 'setup.py', 'build_ext', '-v', _env=env)
+            shprint(hostpython, 'setup.py', 'install', '-O2', _env=env)
+
+            shprint(sh.touch, '.done')
+            
 
 
 recipe = AndroidRecipe()

recipes/pygame/__init__.py

@@ -49,7 +49,7 @@ def build_armeabi(self):
             build_lib = glob.glob('./build/lib*')
             assert len(build_lib) == 1
             print('stripping pygame')
-            shprint(sh.find, build_lib[0], '-name', '"*.o"', '-exec',
+            shprint(sh.find, build_lib[0], '-name', '*.o', '-exec',
                     env['STRIP'], '{}', ';')
 
         python_install_path = join(self.ctx.build_dir, 'python-install')

recipes/pyjnius/__init__.py

@@ -2,7 +2,7 @@
 from toolchain import CythonRecipe, shprint, ArchAndroid, current_directory
 import sh
 import glob
-from os.path import join
+from os.path import join, exists
 
 
 class PyjniusRecipe(CythonRecipe):
@@ -20,7 +20,15 @@ def build_armeabi(self):
         # AND: Hack to make pyjnius setup.py detect android build
         env['NDKPLATFORM'] = 'NOTNONE'
 
+
+        # AND: Don't forget to add a check whether pyjnius has already
+        # been compiled. Currently it redoes it every time.
+
         with current_directory(self.get_actual_build_dir('armeabi')):
+            if exists('.done'):
+                print('android module already compiled, exiting')
+                return
+
             hostpython = sh.Command(self.ctx.hostpython)
 
             # First build is fake in order to generate files that will be cythonized
@@ -41,14 +49,16 @@ def build_armeabi(self):
 
             shprint(hostpython, 'setup.py', 'build_ext', '-v', _env=env)
 
+
             build_lib = glob.glob('./build/lib*')
-            shprint(sh.find, build_lib[0], '-name', '"*.o"', '-exec',
+            shprint(sh.find, build_lib[0], '-name', '*.o', '-exec',
                     env['STRIP'], '{}', ';', _env=env)
 
             shprint(hostpython, 'setup.py', 'install', '-O2', _env=env)
 
             shprint(sh.cp, '-a', join('jnius', 'src', 'org'), self.ctx.javaclass_dir)
 
+            shprint(sh.touch, '.done')