Changed ArchAndroid to specify arch

inclement · inclement · commit fada0ee3f51d · 2015-11-28T23:47:01.000Z
diff --git a/pythonforandroid/bootstraps/empty/__init__.py b/pythonforandroid/bootstraps/empty/__init__.py
@@ -1,4 +1,4 @@
-from pythonforandroid.toolchain import Bootstrap, shprint, current_directory, info, warning, ArchAndroid, logger, info_main, which
+from pythonforandroid.toolchain import Bootstrap, shprint, current_directory, info, warning, ArchAndroidARM, logger, info_main, which
 from os.path import join, exists
 from os import walk
 import glob
diff --git a/pythonforandroid/bootstraps/pygame/__init__.py b/pythonforandroid/bootstraps/pygame/__init__.py
@@ -1,4 +1,4 @@
-from pythonforandroid.toolchain import Bootstrap, shprint, current_directory, info, warning, ArchAndroid, info_main
+from pythonforandroid.toolchain import Bootstrap, shprint, current_directory, info, warning, ArchAndroidARM, info_main
 from os.path import join, exists
 from os import walk
 import glob
@@ -20,7 +20,7 @@ def run_distribute(self):
         src_path = join(self.bootstrap_dir, 'build')
 
         # AND: Hardcoding armeabi - naughty!
-        arch = ArchAndroid(self.ctx)
+        arch = ArchAndroidARM(self.ctx)
 
         with current_directory(self.dist_dir):
 
diff --git a/pythonforandroid/bootstraps/sdl2/__init__.py b/pythonforandroid/bootstraps/sdl2/__init__.py
@@ -1,4 +1,4 @@
-from pythonforandroid.toolchain import Bootstrap, shprint, current_directory, info, warning, ArchAndroid, info_main
+from pythonforandroid.toolchain import Bootstrap, shprint, current_directory, info, warning, ArchAndroidARM, info_main
 from os.path import join, exists
 from os import walk
 import glob
@@ -21,7 +21,7 @@ def run_distribute(self):
                 fileh.write('sdk.dir={}'.format(self.ctx.sdk_dir))
 
         # AND: Hardcoding armeabi - naughty!
-        arch = ArchAndroid(self.ctx)
+        arch = ArchAndroidARM(self.ctx)
 
         with current_directory(self.dist_dir):
             info('Copying python distribution')
diff --git a/pythonforandroid/bootstraps/sdl2python3/__init__.py b/pythonforandroid/bootstraps/sdl2python3/__init__.py
@@ -1,4 +1,4 @@
-from pythonforandroid.toolchain import Bootstrap, shprint, current_directory, info, warning, ArchAndroid, info_main
+from pythonforandroid.toolchain import Bootstrap, shprint, current_directory, info, warning, ArchAndroidARM, info_main
 from os.path import join, exists
 from os import walk
 import glob
@@ -23,7 +23,7 @@ def run_distribute(self):
                 fileh.write('sdk.dir={}'.format(self.ctx.sdk_dir))
 
         # AND: Hardcoding armeabi - naughty!
-        arch = ArchAndroid(self.ctx)
+        arch = ArchAndroidARM(self.ctx)
 
         with current_directory(self.dist_dir):
             info('Copying python distribution')
diff --git a/pythonforandroid/recipes/android/__init__.py b/pythonforandroid/recipes/android/__init__.py
@@ -1,5 +1,5 @@
 
-from pythonforandroid.toolchain import CythonRecipe, shprint, ensure_dir, current_directory, ArchAndroid, IncludedFilesBehaviour
+from pythonforandroid.toolchain import CythonRecipe, shprint, ensure_dir, current_directory, ArchAndroidARM, IncludedFilesBehaviour
 import sh
 from os.path import exists, join
 
diff --git a/pythonforandroid/recipes/freetype/__init__.py b/pythonforandroid/recipes/freetype/__init__.py
@@ -1,5 +1,5 @@
 
-from pythonforandroid.toolchain import Recipe, shprint, get_directory, current_directory, ArchAndroid
+from pythonforandroid.toolchain import Recipe, shprint, get_directory, current_directory, ArchAndroidARM
 from os.path import exists, join, realpath
 from os import uname
 import glob
diff --git a/pythonforandroid/recipes/harfbuzz/__init__.py b/pythonforandroid/recipes/harfbuzz/__init__.py
@@ -1,5 +1,5 @@
 
-from pythonforandroid.toolchain import Recipe, shprint, get_directory, current_directory, ArchAndroid
+from pythonforandroid.toolchain import Recipe, shprint, get_directory, current_directory, ArchAndroidARM
 from os.path import exists, join, realpath
 from os import uname
 import glob
diff --git a/pythonforandroid/recipes/kivy/__init__.py b/pythonforandroid/recipes/kivy/__init__.py
@@ -1,5 +1,5 @@
 
-from pythonforandroid.toolchain import CythonRecipe, shprint, current_directory, ArchAndroid
+from pythonforandroid.toolchain import CythonRecipe, shprint, current_directory, ArchAndroidARM
 from os.path import exists, join
 import sh
 import glob
diff --git a/pythonforandroid/recipes/kivysdl2python3/__init__.py b/pythonforandroid/recipes/kivysdl2python3/__init__.py
@@ -1,5 +1,5 @@
 
-from pythonforandroid.toolchain import CythonRecipe, shprint, current_directory, ArchAndroid
+from pythonforandroid.toolchain import CythonRecipe, shprint, current_directory, ArchAndroidARM
 from os.path import exists, join
 import sh
 import glob
@@ -35,7 +35,7 @@ def get_recipe_env(self, arch):
         return env
         
     # def build_armeabi(self):
-    #     env = ArchAndroid(self.ctx).get_env()
+    #     env = ArchAndroidARM(self.ctx).get_env()
 
     #     env['LDFLAGS'] = env['LDFLAGS'] + ' -L{}'.format(self.ctx.libs_dir)
     #     env['LDSHARED'] = env['LIBLINK']
diff --git a/pythonforandroid/recipes/pygame/__init__.py b/pythonforandroid/recipes/pygame/__init__.py
@@ -1,5 +1,5 @@
 
-from pythonforandroid.toolchain import Recipe, shprint, ArchAndroid, current_directory, debug, info, ensure_dir
+from pythonforandroid.toolchain import Recipe, shprint, ArchAndroidARM, current_directory, debug, info, ensure_dir
 from os.path import exists, join
 import sh
 import glob
@@ -40,7 +40,7 @@ def prebuild_armeabi(self):
     def build_armeabi(self):
         # AND: I'm going to ignore any extra pythonrecipe or cythonrecipe behaviour for now
         
-        arch = ArchAndroid(self.ctx)
+        arch = ArchAndroidARM(self.ctx)
         env = self.get_recipe_env(arch)
         
         env['CFLAGS'] = env['CFLAGS'] + ' -I{jni_path}/png -I{jni_path}/jpeg'.format(
diff --git a/pythonforandroid/recipes/pyjnius/__init__.py b/pythonforandroid/recipes/pyjnius/__init__.py
@@ -1,5 +1,5 @@
 
-from pythonforandroid.toolchain import CythonRecipe, shprint, ArchAndroid, current_directory, info
+from pythonforandroid.toolchain import CythonRecipe, shprint, ArchAndroidARM, current_directory, info
 import sh
 import glob
 from os.path import join, exists
diff --git a/pythonforandroid/recipes/pysdl2/__init__.py b/pythonforandroid/recipes/pysdl2/__init__.py
@@ -1,5 +1,5 @@
 
-from pythonforandroid.toolchain import PythonRecipe, shprint, current_directory, ArchAndroid
+from pythonforandroid.toolchain import PythonRecipe, shprint, current_directory, ArchAndroidARM
 from os.path import exists, join
 import sh
 import glob
diff --git a/pythonforandroid/recipes/python2/__init__.py b/pythonforandroid/recipes/python2/__init__.py
@@ -1,5 +1,5 @@
 
-from pythonforandroid.toolchain import Recipe, shprint, get_directory, current_directory, ArchAndroid, info
+from pythonforandroid.toolchain import Recipe, shprint, get_directory, current_directory, ArchAndroidARM, info
 from os.path import exists, join, realpath
 from os import uname
 import glob
@@ -92,7 +92,7 @@ def do_python_build(self):
             hostpython_recipe = Recipe.get_recipe('hostpython2', self.ctx)
             shprint(sh.cp, join(hostpython_recipe.get_recipe_dir(), 'Setup'), 'Modules')
 
-            env = ArchAndroid(self.ctx).get_env()
+            env = ArchAndroidARM(self.ctx).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/python3/__init__.py b/pythonforandroid/recipes/python3/__init__.py
@@ -1,5 +1,5 @@
 
-from pythonforandroid.toolchain import Recipe, shprint, get_directory, current_directory, ArchAndroid
+from pythonforandroid.toolchain import Recipe, shprint, get_directory, current_directory, ArchAndroidARM
 from os.path import exists, join
 from os import uname
 import glob
@@ -67,7 +67,7 @@ def build_armeabi(self):
             hostpython_recipe = Recipe.get_recipe('hostpython3', self.ctx)
             # shprint(sh.cp, join(hostpython_recipe.get_recipe_dir(), 'Setup'), 'Modules')
 
-            env = ArchAndroid(self.ctx).get_env()
+            env = ArchAndroidARM(self.ctx).get_env()
             env["LDFLAGS"] = env["LDFLAGS"] + ' -llog'
 
             # AND: Should probably move these to get_recipe_env for
diff --git a/pythonforandroid/recipes/sdl/__init__.py b/pythonforandroid/recipes/sdl/__init__.py
@@ -1,4 +1,4 @@
-from pythonforandroid.toolchain import NDKRecipe, shprint, ArchAndroid, current_directory, info
+from pythonforandroid.toolchain import NDKRecipe, shprint, ArchAndroidARM, current_directory, info
 from os.path import exists, join
 import sh
 
@@ -15,7 +15,7 @@ def build_armeabi(self):
             info('libsdl.so already exists, skipping sdl build.')
             return
         
-        env = ArchAndroid(self.ctx).get_env()
+        env = ArchAndroidARM(self.ctx).get_env()
 
         with current_directory(self.get_jni_dir()):
             shprint(sh.ndk_build, 'V=1', _env=env, _tail=20, _critical=True)
diff --git a/pythonforandroid/toolchain.py b/pythonforandroid/toolchain.py
@@ -456,6 +456,13 @@ def include_dirs(self):
                 d.format(arch=self))
             for d in self.ctx.include_dirs]
 
+    def get_env(self):
+        raise ValueError('Tried to get_env of Arch, this needs '
+                         'a specific Arch subclass')
+
+class ArchAndroidARM(Arch):
+    arch = "armeabi"
+
     def get_env(self):
         include_dirs = [
             "-I{}/{}".format(
@@ -526,9 +533,13 @@ def get_env(self):
 
         return env
 
+class ArchAndroidARMv7_a(ArchAndroidARM):
+    arch = 'armeabi-v7'
 
-class ArchAndroid(Arch):
-    arch = "armeabi"
+    def get_env(self):
+        env = super(ArchAndroidARMv7_a, self).get_env()
+        env['CFLAGS'] = env['CFLAGS'] + ' -march=armv7-a -mfloat-abi=softfp -mfpu=vfp -mthumb'
+        env['CXXFLAGS'] = env['CFLAGS']
 
 # class ArchSimulator(Arch):
 #     sdk = "iphonesimulator"
@@ -1072,7 +1083,7 @@ def __init__(self):
 
         # AND: Currently only the Android architecture is supported
         self.archs = (
-            ArchAndroid(self),
+            ArchAndroidARM(self),
             )
 
         ensure_dir(join(self.build_dir, 'bootstrap_builds'))
@@ -2446,8 +2457,8 @@ def biglink(ctx, arch):
 
     # AND: Shouldn't hardcode ArchAndroid! In reality need separate
     # build dirs for each arch
-    arch = ArchAndroid(ctx)
-    env = ArchAndroid(ctx).get_env()
+    arch = ArchAndroidARM(ctx)
+    env = ArchAndroidARM(ctx).get_env()
     env['LDFLAGS'] = env['LDFLAGS'] + ' -L{}'.format(
         join(ctx.bootstrap.build_dir, 'obj', 'local', 'armeabi'))
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from pythonforandroid.toolchain import Bootstrap, shprint, current_directory, info, warning, ArchAndroid, logger, info_main, which`
	`1`	`+from pythonforandroid.toolchain import Bootstrap, shprint, current_directory, info, warning, ArchAndroidARM, logger, info_main, which`
`2`	`2`	`from os.path import join, exists`
`3`	`3`	`from os import walk`
`4`	`4`	`import glob`