Removed more hardcoded Archs

inclement · inclement · commit 13e850127f6f · 2015-12-05T00:26:33.000Z
diff --git a/pythonforandroid/recipes/pygame/__init__.py b/pythonforandroid/recipes/pygame/__init__.py
@@ -26,21 +26,20 @@ def get_recipe_env(self, arch):
         ensure_dir(liblink_path)
         return env
 
-    def prebuild_armeabi(self):
-        if exists(join(self.get_build_container_dir('armeabi'), '.patched')):
+    def prebuild_arch(self, arch):
+        if exists(join(self.get_build_container_dir(arch.arch), '.patched')):
             info('Pygame already patched, skipping.')
             return
         shprint(sh.cp, join(self.get_recipe_dir(), 'Setup'),
-                join(self.get_build_dir('armeabi'), 'Setup'))
+                join(self.get_build_dir(arch.arch), 'Setup'))
         self.apply_patch(join('patches', 'fix-surface-access.patch'), arch.arch)
         self.apply_patch(join('patches', 'fix-array-surface.patch'), arch.arch)
         self.apply_patch(join('patches', 'fix-sdl-spam-log.patch'), arch.arch)
-        shprint(sh.touch, join(self.get_build_container_dir('armeabi'), '.patched'))
+        shprint(sh.touch, join(self.get_build_container_dir(arch.arch), '.patched'))
         
-    def build_armeabi(self):
+    def build_arch(self, arch):
         # AND: I'm going to ignore any extra pythonrecipe or cythonrecipe behaviour for now
         
-        arch = ArchARM(self.ctx)
         env = self.get_recipe_env(arch)
         
         env['CFLAGS'] = env['CFLAGS'] + ' -I{jni_path}/png -I{jni_path}/jpeg'.format(
@@ -57,7 +56,7 @@ def build_armeabi(self):
 
         env['LDSHARED'] = join(self.ctx.root_dir, 'tools', 'liblink')
 
-        with current_directory(self.get_build_dir('armeabi')):
+        with current_directory(self.get_build_dir(arch.arch)):
             info('hostpython is ' + self.ctx.hostpython)
             hostpython = sh.Command(self.ctx.hostpython)
             shprint(hostpython, 'setup.py', 'install', '-O2', _env=env,
diff --git a/pythonforandroid/recipes/python2/__init__.py b/pythonforandroid/recipes/python2/__init__.py
@@ -94,7 +94,7 @@ def do_python_build(self, arch):
             hostpython_recipe = Recipe.get_recipe('hostpython2', self.ctx)
             shprint(sh.cp, join(hostpython_recipe.get_recipe_dir(), 'Setup'), 'Modules')
 
-            env = ArchARM(self.ctx).get_env()
+            env = arch.get_env()
 
             # AND: Should probably move these to get_recipe_env for
             # neatness, but the whole recipe needs tidying along these
diff --git a/pythonforandroid/recipes/sdl/__init__.py b/pythonforandroid/recipes/sdl/__init__.py
@@ -9,22 +9,22 @@ class LibSDLRecipe(NDKRecipe):
     depends = ['python2', 'pygame_bootstrap_components']
     conflicts = ['sdl2']
 
-    def build_armeabi(self):
+    def build_arch(self, arch):
 
         if exists(join(self.ctx.libs_dir, 'libsdl.so')):
             info('libsdl.so already exists, skipping sdl build.')
             return
         
-        env = ArchARM(self.ctx).get_env()
+        env = arch.get_env()
 
         with current_directory(self.get_jni_dir()):
             shprint(sh.ndk_build, 'V=1', _env=env, _tail=20, _critical=True)
 
-        libs_dir = join(self.ctx.bootstrap.build_dir, 'libs', 'armeabi')
+        libs_dir = join(self.ctx.bootstrap.build_dir, 'libs', arch.arch)
         import os
         contents = list(os.walk(libs_dir))[0][-1]
         for content in contents:
-            shprint(sh.cp, '-a', join(self.ctx.bootstrap.build_dir, 'libs', 'armeabi', content),
+            shprint(sh.cp, '-a', join(self.ctx.bootstrap.build_dir, 'libs', arch.arch, content),
                     self.ctx.libs_dir)
 
 
