More fixes to hardcoded armeabi

inclement · inclement · commit 7174dfe82a18 · 2015-11-30T22:19:00.000Z
Build works with armeabi-v7a now
diff --git a/pythonforandroid/bootstraps/sdl2/__init__.py b/pythonforandroid/bootstraps/sdl2/__init__.py
@@ -21,7 +21,10 @@ def run_distribute(self):
                 fileh.write('sdk.dir={}'.format(self.ctx.sdk_dir))
 
         # AND: Hardcoding armeabi - naughty!
-        arch = ArchARM(self.ctx)
+        arch = self.ctx.archs[0]
+        if len(self.ctx.archs) > 1:
+            raise ValueError('built for more than one arch, but bootstrap cannot handle that yet')
+        info('Bootstrap running with arch {}'.format(arch))
 
         with current_directory(self.dist_dir):
             info('Copying python distribution')
@@ -32,7 +35,6 @@ def run_distribute(self):
                 shprint(sh.mkdir, 'assets')
             
             hostpython = sh.Command(self.ctx.hostpython)
-            # AND: This *doesn't* need to be in arm env?
             shprint(hostpython, '-OO', '-m', 'compileall',
                     self.ctx.get_python_install_dir(),
                     _tail=10, _filterout="^Listing", _critical=True)
@@ -50,8 +52,8 @@ def run_distribute(self):
             shprint(sh.mkdir, '-p', join('private', 'include', 'python2.7'))
             
             # AND: Copylibs stuff should go here
-            if exists(join('libs', 'armeabi', 'libpymodules.so')):
-                shprint(sh.mv, join('libs', 'armeabi', 'libpymodules.so'), 'private/')
+            if exists(join('libs', arch.arch, 'libpymodules.so')):
+                shprint(sh.mv, join('libs', arch.arch, 'libpymodules.so'), 'private/')
             shprint(sh.cp, join('python-install', 'include' , 'python2.7', 'pyconfig.h'), join('private', 'include', 'python2.7/'))
 
             info('Removing some unwanted files')
diff --git a/pythonforandroid/toolchain.py b/pythonforandroid/toolchain.py
@@ -2485,9 +2485,7 @@ def biglink(ctx, arch):
 
     # AND: Shouldn't hardcode Arch! In reality need separate
     # build dirs for each arch
-    raise ValueError('hardcoded Arch to fix!')
-    arch = ArchARM(ctx)
-    env = ArchARM(ctx).get_env()
+    env = arch.get_env()
     env['LDFLAGS'] = env['LDFLAGS'] + ' -L{}'.format(
         join(ctx.bootstrap.build_dir, 'obj', 'local', arch.arch))
 
