Changed some crystax checks to check python recipe

inclement · inclement · commit 3354e28f85f6 · 2016-01-10T21:23:13.000Z
diff --git a/pythonforandroid/build.py b/pythonforandroid/build.py
@@ -480,7 +480,7 @@ def get_site_packages_dir(self, arch=None):
         # AND: This *must* be replaced with something more general in
         # order to support multiple python versions and/or multiple
         # archs.
-        if self.ndk_is_crystax:
+        if self.python_recipe.from_crystax:
             return self.get_python_install_dir()
         return join(self.get_python_install_dir(),
                     'lib', 'python2.7', 'site-packages')
diff --git a/pythonforandroid/recipe.py b/pythonforandroid/recipe.py
@@ -829,8 +829,8 @@ def build_cython_components(self, arch):
 
         env = self.get_recipe_env(arch)
 
-        if self.ctx.ndk_is_crystax:
-            site_packages_dirs = sh.Command('python3.5')('-c', 'import site; print("\\n".join(site.getsitepackages()))').stdout.split('\n')
+        if self.ctx.python_recipe.from_crystax:
+            site_packages_dirs = sh.Command('python{}'.format(self.ctx.python_recipe.version)('-c', 'import site; print("\\n".join(site.getsitepackages()))').stdout.split('\n')
             # env['PYTHONPATH'] = '/usr/lib/python3.5/site-packages/:/usr/lib/python3.5'
             if 'PYTHONPATH' in env:
                 env['PYTHONPATH'] = env + ':{}'.format(':'.join(site_packages_dirs))
