support include directory per architecture

ilyaiqoqo · ilyaiqoqo · commit 77511b6db9c4 · 2018-04-03T18:31:50.000+03:00
diff --git a/pythonforandroid/archs.py b/pythonforandroid/archs.py
@@ -9,6 +9,9 @@
 
 class Arch(object):
 
+    include_prefix = None
+    '''The prefix for the include dir in the NDK.'''
+
     toolchain_prefix = None
     '''The prefix for the toolchain dir in the NDK.'''
 
@@ -44,7 +47,7 @@ def get_env(self, with_flags_in_cc=True):
             # post-15 NDK per
             # https://android.googlesource.com/platform/ndk/+/ndk-r15-release/docs/UnifiedHeaders.md
             env['CFLAGS'] += ' -isystem {}/sysroot/usr/include/{}'.format(
-                self.ctx.ndk_dir, self.ctx.toolchain_prefix)
+                self.ctx.ndk_dir, self.ctx.include_prefix)
         else:
             sysroot = self.ctx.ndk_platform
             env['CFLAGS'] += ' -I{}'.format(self.ctx.ndk_platform)
@@ -67,10 +70,12 @@ def get_env(self, with_flags_in_cc=True):
         if py_platform in ['linux2', 'linux3']:
             py_platform = 'linux'
 
+        include_prefix = self.ctx.include_prefix
         toolchain_prefix = self.ctx.toolchain_prefix
         toolchain_version = self.ctx.toolchain_version
         command_prefix = self.command_prefix
 
+        env['INCLUDE_PREFIX'] = include_prefix
         env['TOOLCHAIN_PREFIX'] = toolchain_prefix
         env['TOOLCHAIN_VERSION'] = toolchain_version
 
@@ -138,6 +143,7 @@ def get_env(self, with_flags_in_cc=True):
 
 class ArchARM(Arch):
     arch = "armeabi"
+    include_prefix = 'arm-linux-androideabi'
     toolchain_prefix = 'arm-linux-androideabi'
     command_prefix = 'arm-linux-androideabi'
     platform_dir = 'arch-arm'
@@ -157,6 +163,7 @@ def get_env(self, with_flags_in_cc=True):
 
 class Archx86(Arch):
     arch = 'x86'
+    include_prefix = 'i686-linux-android'
     toolchain_prefix = 'x86'
     command_prefix = 'i686-linux-android'
     platform_dir = 'arch-x86'
@@ -171,7 +178,8 @@ def get_env(self, with_flags_in_cc=True):
 
 class Archx86_64(Arch):
     arch = 'x86_64'
-    toolchain_prefix = 'x86'
+    include_prefix = 'x86_64-linux-android'
+    toolchain_prefix = 'x86_64'
     command_prefix = 'x86_64-linux-android'
     platform_dir = 'arch-x86'
 
@@ -185,6 +193,7 @@ def get_env(self, with_flags_in_cc=True):
 
 class ArchAarch_64(Arch):
     arch = 'arm64-v8a'
+    include_prefix = 'aarch64-linux-android'
     toolchain_prefix = 'aarch64-linux-android'
     command_prefix = 'aarch64-linux-android'
     platform_dir = 'arch-arm64'
diff --git a/pythonforandroid/build.py b/pythonforandroid/build.py
@@ -364,6 +364,7 @@ def prepare_build_environment(self, user_sdk_dir, user_ndk_dir,
         # This would need to be changed if supporting multiarch APKs
         arch = self.archs[0]
         platform_dir = arch.platform_dir
+        include_prefix = arch.include_prefix
         toolchain_prefix = arch.toolchain_prefix
         toolchain_version = None
         self.ndk_platform = join(
@@ -380,6 +381,13 @@ def prepare_build_environment(self, user_sdk_dir, user_ndk_dir,
         if py_platform in ['linux2', 'linux3']:
             py_platform = 'linux'
 
+        self.include_prefix = include_prefix
+        include_path = join(self.ndk_dir, 'sysroot/usr/include/', self.include_prefix)
+        if not os.path.isdir(include_path):
+            warning('include directory doesn\'t exist: {}'.format(
+                include_path))
+            ok = False
+
         toolchain_versions = []
         toolchain_path = join(self.ndk_dir, 'toolchains')
         if os.path.isdir(toolchain_path):
@@ -446,6 +454,7 @@ def __init__(self):
         self._ndk_ver = None
         self.ndk = None
 
+        self.include_prefix = None
         self.toolchain_prefix = None
         self.toolchain_version = None
 
diff --git a/pythonforandroid/recipes/numpy/__init__.py b/pythonforandroid/recipes/numpy/__init__.py
@@ -48,8 +48,6 @@ def get_recipe_env(self, arch):
     def prebuild_arch(self, arch):
         super(NumpyRecipe, self).prebuild_arch(arch)
 
-        warning('Numpy is built assuming the archiver name is '
-                'arm-linux-androideabi-ar, which may not always be true!')
 
 
 recipe = NumpyRecipe()
