ndk lib folder (or ndk platform) now is ABI specific

Author: misl6

pythonforandroid/archs.py

@@ -1,9 +1,10 @@
 from distutils.spawn import find_executable
 from os import environ
-from os.path import join, split
+from os.path import join, split, exists
 from multiprocessing import cpu_count
 from glob import glob
 
+from pythonforandroid.logger import warning
 from pythonforandroid.recipe import Recipe
 from pythonforandroid.util import BuildInterruptingException, build_platform
 
@@ -30,7 +31,7 @@ class Arch:
     common_cppflags = [
         '-DANDROID',
         '-D__ANDROID_API__={ctx.ndk_api}',
-        '-I{ctx.ndk_dir}/sysroot/usr/include/{command_prefix}',
+        '-I{ctx.ndk_sysroot}/usr/include/{command_prefix}',
         '-I{python_includes}',
     ]
 
@@ -57,6 +58,24 @@ def __init__(self, ctx):
     def __str__(self):
         return self.arch
 
+    @property
+    def ndk_lib_dir(self):
+        return join(self.ctx.ndk_sysroot, 'usr', 'lib', self.command_prefix, str(self.ctx.ndk_api))
+
+    @property
+    def ndk_platform(self):
+        warning("ndk_platform is deprecated and should be avoided in new recipes")
+        ndk_platform = join(
+            self.ctx.ndk_dir,
+            'platforms',
+            'android-{}'.format(self.ctx.ndk_api),
+            self.platform_dir)
+        if not exists(ndk_platform):
+            BuildInterruptingException(
+                "The requested platform folder doesn't exist. If you're building on ndk >= r22, and seeing this error, one of the required recipe is using a removed feature."
+            )
+        return ndk_platform
+
     @property
     def include_dirs(self):
         return [
@@ -213,8 +232,8 @@ def get_env(self, with_flags_in_cc=True):
         # Android's arch/toolchain
         env['ARCH'] = self.arch
         env['NDK_API'] = 'android-{}'.format(str(self.ctx.ndk_api))
-        env['TOOLCHAIN_PREFIX'] = self.ctx.toolchain_prefix
-        env['TOOLCHAIN_VERSION'] = self.ctx.toolchain_version
+        env['TOOLCHAIN_PREFIX'] = self.toolchain_prefix
+        env['TOOLCHAIN_VERSION'] = self.toolchain_version
 
         # Custom linker options
         env['LDSHARED'] = env['CC'] + ' ' + ' '.join(self.common_ldshared)

pythonforandroid/build.py

@@ -24,20 +24,18 @@
 from pythonforandroid.recommendations import (
     check_ndk_version, check_target_api, check_ndk_api,
     RECOMMENDED_NDK_API, RECOMMENDED_TARGET_API)
+from pythonforandroid.util import build_platform
 
 
-def get_ndk_platform_dir(ndk_dir, ndk_api, arch):
-    ndk_platform_dir_exists = True
-    platform_dir = arch.platform_dir
-    ndk_platform = join(
-        ndk_dir,
-        'platforms',
-        'android-{}'.format(ndk_api),
-        platform_dir)
-    if not exists(ndk_platform):
-        warning("ndk_platform doesn't exist: {}".format(ndk_platform))
-        ndk_platform_dir_exists = False
-    return ndk_platform, ndk_platform_dir_exists
+def get_ndk_standalone(ndk_dir):
+    return join(ndk_dir, 'toolchains', 'llvm', 'prebuilt', build_platform)
+
+
+def get_ndk_sysroot(ndk_dir):
+    sysroot = join(get_ndk_standalone(ndk_dir), 'sysroot')
+    if not exists(sysroot):
+        warning("sysroot doesn't exist: {}".format(sysroot))
+    return sysroot
 
 
 def get_toolchain_versions(ndk_dir, arch):
@@ -114,7 +112,8 @@ class Context:
 
     ccache = None  # whether to use ccache
 
-    ndk_platform = None  # the ndk platform directory
+    ndk_standalone = None
+    ndk_include_dir = None  # usr/include
 
     bootstrap = None
     bootstrap_build_dir = None
@@ -296,7 +295,9 @@ def prepare_build_environment(self,
         android_api = int(android_api)
         self.android_api = android_api
 
-        check_target_api(android_api, self.archs[0].arch)
+        for arch in self.archs:
+            # Maybe We could remove this one in a near future (ARMv5 is definitely old)
+            check_target_api(android_api, arch)
         apis = get_available_apis(self.sdk_dir)
         info('Available Android APIs are ({})'.format(
             ', '.join(map(str, apis))))
@@ -375,60 +376,60 @@ def prepare_build_environment(self,
                     ' a python 3 target (which is the default)'
                     ' then THINGS WILL BREAK.')
 
-        # This would need to be changed if supporting multiarch APKs
-        arch = self.archs[0]
-        toolchain_prefix = arch.toolchain_prefix
-        self.ndk_platform, ndk_platform_dir_exists = get_ndk_platform_dir(
-            self.ndk_dir, self.ndk_api, arch)
-        ok = ok and ndk_platform_dir_exists
-
         py_platform = sys.platform
         if py_platform in ['linux2', 'linux3']:
             py_platform = 'linux'
-        toolchain_versions, toolchain_path_exists = get_toolchain_versions(
-            self.ndk_dir, arch)
-        ok = ok and toolchain_path_exists
-        toolchain_versions.sort()
-
-        toolchain_versions_gcc = []
-        for toolchain_version in toolchain_versions:
-            if toolchain_version[0].isdigit():
-                # GCC toolchains begin with a number
-                toolchain_versions_gcc.append(toolchain_version)
-
-        if toolchain_versions:
-            info('Found the following toolchain versions: {}'.format(
-                toolchain_versions))
-            info('Picking the latest gcc toolchain, here {}'.format(
-                toolchain_versions_gcc[-1]))
-            toolchain_version = toolchain_versions_gcc[-1]
-        else:
-            warning('Could not find any toolchain for {}!'.format(
-                toolchain_prefix))
-            ok = False
-
-        self.toolchain_prefix = toolchain_prefix
-        self.toolchain_version = toolchain_version
-        # Modify the path so that sh finds modules appropriately
-        environ['PATH'] = (
-            '{ndk_dir}/toolchains/{toolchain_prefix}-{toolchain_version}/'
-            'prebuilt/{py_platform}-x86/bin/:{ndk_dir}/toolchains/'
-            '{toolchain_prefix}-{toolchain_version}/prebuilt/'
-            '{py_platform}-x86_64/bin/:{ndk_dir}:{sdk_dir}/'
-            'tools:{path}').format(
-                sdk_dir=self.sdk_dir, ndk_dir=self.ndk_dir,
-                toolchain_prefix=toolchain_prefix,
-                toolchain_version=toolchain_version,
-                py_platform=py_platform, path=environ.get('PATH'))
-
-        for executable in ("pkg-config", "autoconf", "automake", "libtoolize",
-                           "tar", "bzip2", "unzip", "make", "gcc", "g++"):
-            if not sh.which(executable):
-                warning(f"Missing executable: {executable} is not installed")
-
-        if not ok:
-            raise BuildInterruptingException(
-                'python-for-android cannot continue due to the missing executables above')
+
+        self.ndk_standalone = get_ndk_standalone(self.ndk_dir)
+        self.ndk_sysroot = get_ndk_sysroot(self.ndk_dir)
+        ok = ok and exists(self.ndk_sysroot)
+        self.ndk_include_dir = join(self.ndk_sysroot, 'usr', 'include')
+
+        for arch in self.archs:
+
+            toolchain_versions, toolchain_path_exists = get_toolchain_versions(
+                self.ndk_dir, arch)
+            ok = ok and toolchain_path_exists
+            toolchain_versions.sort()
+
+            toolchain_versions_gcc = []
+            for toolchain_version in toolchain_versions:
+                if toolchain_version[0].isdigit():
+                    # GCC toolchains begin with a number
+                    toolchain_versions_gcc.append(toolchain_version)
+
+            if toolchain_versions:
+                info('Found the following toolchain versions: {}'.format(
+                    toolchain_versions))
+                info('Picking the latest gcc toolchain, here {}'.format(
+                    toolchain_versions_gcc[-1]))
+                toolchain_version = toolchain_versions_gcc[-1]
+            else:
+                warning('Could not find any toolchain for {}!'.format(
+                    arch.toolchain_prefix))
+                ok = False
+
+            # Modify the path so that sh finds modules appropriately
+            arch.toolchain_version = toolchain_version
+            environ['PATH'] = (
+                '{ndk_dir}/toolchains/{toolchain_prefix}-{toolchain_version}/'
+                'prebuilt/{py_platform}-x86/bin/:{ndk_dir}/toolchains/'
+                '{toolchain_prefix}-{toolchain_version}/prebuilt/'
+                '{py_platform}-x86_64/bin/:{ndk_dir}:{sdk_dir}/'
+                'tools:{path}').format(
+                    sdk_dir=self.sdk_dir, ndk_dir=self.ndk_dir,
+                    toolchain_prefix=arch.toolchain_prefix,
+                    toolchain_version=toolchain_version,
+                    py_platform=py_platform, path=environ.get('PATH'))
+
+            for executable in ("pkg-config", "autoconf", "automake", "libtoolize",
+                               "tar", "bzip2", "unzip", "make", "gcc", "g++"):
+                if not sh.which(executable):
+                    warning(f"Missing executable: {executable} is not installed")
+
+            if not ok:
+                raise BuildInterruptingException(
+                    'python-for-android cannot continue due to the missing executables above')
 
     def __init__(self):
         self.include_dirs = []
@@ -441,9 +442,6 @@ def __init__(self):
         self._ndk_api = None
         self.ndk = None
 
-        self.toolchain_prefix = None
-        self.toolchain_version = None
-
         self.local_recipes = None
         self.copy_libs = False
 
@@ -887,7 +885,7 @@ def biglink(ctx, arch):
 
     # Move to the directory containing crtstart_so.o and crtend_so.o
     # This is necessary with newer NDKs? A gcc bug?
-    with current_directory(join(ctx.ndk_platform, 'usr', 'lib')):
+    with current_directory(arch.ndk_lib_dir):
         do_biglink(
             join(ctx.get_libs_dir(arch.arch), 'libpymodules.so'),
             obj_dir.split(' '),

pythonforandroid/recipe.py

@@ -1142,7 +1142,7 @@ def get_recipe_env(self, arch, with_flags_in_cc=True):
         env['LDSHARED'] = env['CC'] + ' -shared'
         # shprint(sh.whereis, env['LDSHARED'], _env=env)
         env['LIBLINK'] = 'NOTNONE'
-        env['NDKPLATFORM'] = self.ctx.ndk_platform
+        env['NDKPLATFORM'] = self.ctx.ndk_sysroot  # FIXME?
         if self.ctx.copy_libs:
             env['COPYLIBS'] = '1'
 

pythonforandroid/recipes/Pillow/__init__.py

@@ -35,9 +35,9 @@ class PillowRecipe(CompiledComponentsPythonRecipe):
     def get_recipe_env(self, arch=None, with_flags_in_cc=True):
         env = super().get_recipe_env(arch, with_flags_in_cc)
 
-        env['ANDROID_ROOT'] = join(self.ctx.ndk_platform, 'usr')
-        ndk_lib_dir = join(self.ctx.ndk_platform, 'usr', 'lib')
-        ndk_include_dir = join(self.ctx.ndk_dir, 'sysroot', 'usr', 'include')
+        env['ANDROID_ROOT'] = join(arch.ndk_platform, 'usr')
+        ndk_lib_dir = arch.ndk_lib_dir
+        ndk_include_dir = self.ctx.ndk_include_dir
 
         png = self.get_recipe('png', self.ctx)
         png_lib_dir = join(png.get_build_dir(arch.arch), '.libs')

pythonforandroid/recipes/audiostream/__init__.py

@@ -25,7 +25,7 @@ def get_recipe_env(self, arch):
                               jni_path=join(self.ctx.bootstrap.build_dir, 'jni'),
                               sdl_include=sdl_include,
                               sdl_mixer_include=sdl_mixer_include)
-        env['NDKPLATFORM'] = self.ctx.ndk_platform
+        env['NDKPLATFORM'] = arch.ndk_platform
         env['LIBLINK'] = 'NOTNONE'  # Hacky fix. Needed by audiostream setup.py
         return env
 

pythonforandroid/recipes/cffi/__init__.py

@@ -35,9 +35,7 @@ def get_recipe_env(self, arch=None):
                           self.ctx.get_libs_dir(arch.arch))
         env['LDFLAGS'] += ' -L{}'.format(os.path.join(self.ctx.bootstrap.build_dir, 'libs', arch.arch))
         # required for libc and libdl
-        ndk_dir = self.ctx.ndk_platform
-        ndk_lib_dir = os.path.join(ndk_dir, 'usr', 'lib')
-        env['LDFLAGS'] += ' -L{}'.format(ndk_lib_dir)
+        env['LDFLAGS'] += ' -L{}'.format(arch.ndk_lib_dir)
         env['PYTHONPATH'] = ':'.join([
             self.ctx.get_site_packages_dir(),
             env['BUILDLIB_PATH'],

pythonforandroid/recipes/evdev/__init__.py

@@ -18,7 +18,7 @@ class EvdevRecipe(CompiledComponentsPythonRecipe):
 
     def get_recipe_env(self, arch=None):
         env = super().get_recipe_env(arch)
-        env['NDKPLATFORM'] = self.ctx.ndk_platform
+        env['NDKPLATFORM'] = arch.ndk_platform
         return env
 
 

pythonforandroid/recipes/freetype/__init__.py

@@ -47,8 +47,8 @@ def get_recipe_env(self, arch=None, with_harfbuzz=False):
             )
 
         # android's zlib support
-        zlib_lib_path = join(self.ctx.ndk_platform, 'usr', 'lib')
-        zlib_includes = join(self.ctx.ndk_dir, 'sysroot', 'usr', 'include')
+        zlib_lib_path = arch.ndk_lib_dir
+        zlib_includes = self.ctx.ndk_include_dir
 
         def add_flag_if_not_added(flag, env_key):
             if flag not in env[env_key]:

pythonforandroid/recipes/libogg/__init__.py

@@ -12,7 +12,7 @@ def build_arch(self, arch):
         with current_directory(self.get_build_dir(arch.arch)):
             env = self.get_recipe_env(arch)
             flags = [
-                '--with-sysroot=' + self.ctx.ndk_platform,
+                '--with-sysroot=' + arch.ndk_platform,
                 '--host=' + arch.toolchain_prefix,
             ]
             configure = sh.Command('./configure')

pythonforandroid/recipes/librt/__init__.py

@@ -18,11 +18,8 @@ class LibRt(Recipe):
         libc, so we create a symbolic link which we will remove when our build
         finishes'''
 
-    @property
-    def libc_path(self):
-        return join(self.ctx.ndk_platform, 'usr', 'lib', 'libc')
-
     def build_arch(self, arch):
+        libc_path = join(arch.ndk_platform, 'usr', 'lib', 'libc')
         # Create a temporary folder to add to link path with a fake librt.so:
         fake_librt_temp_folder = join(
             self.get_build_dir(arch.arch),
@@ -35,13 +32,13 @@ def build_arch(self, arch):
         if exists(join(fake_librt_temp_folder, "librt.so")):
             remove(join(fake_librt_temp_folder, "librt.so"))
         shprint(sh.ln, '-sf',
-                self.libc_path + '.so',
+                libc_path + '.so',
                 join(fake_librt_temp_folder, "librt.so"),
                 )
         if exists(join(fake_librt_temp_folder, "librt.a")):
             remove(join(fake_librt_temp_folder, "librt.a"))
         shprint(sh.ln, '-sf',
-                self.libc_path + '.a',
+                libc_path + '.a',
                 join(fake_librt_temp_folder, "librt.a"),
                )
 

pythonforandroid/recipes/libvorbis/__init__.py

@@ -21,7 +21,7 @@ def build_arch(self, arch):
         with current_directory(self.get_build_dir(arch.arch)):
             env = self.get_recipe_env(arch)
             flags = [
-                '--with-sysroot=' + self.ctx.ndk_platform,
+                '--with-sysroot=' + arch.ndk_platform,
                 '--host=' + arch.toolchain_prefix,
             ]
             configure = sh.Command('./configure')

pythonforandroid/recipes/lxml/__init__.py

@@ -51,8 +51,8 @@ def get_recipe_env(self, arch):
         env['LIBS'] += ' -lxml2'
 
         # android's ndk flags
-        ndk_lib_dir = join(self.ctx.ndk_platform, 'usr', 'lib')
-        ndk_include_dir = join(self.ctx.ndk_dir, 'sysroot', 'usr', 'include')
+        ndk_lib_dir = arch.ndk_lib_dir
+        ndk_include_dir = self.ndk_include_dir
         cflags += ' -I' + ndk_include_dir
         env['LDFLAGS'] += ' -L' + ndk_lib_dir
         env['LIBS'] += ' -lz -lm -lc'

pythonforandroid/recipes/openssl/__init__.py

@@ -96,7 +96,8 @@ def get_recipe_env(self, arch=None):
         env = super().get_recipe_env(arch)
         env['OPENSSL_VERSION'] = self.version
         env['MAKE'] = 'make'  # This removes the '-j5', which isn't safe
-        env['ANDROID_NDK'] = self.ctx.ndk_dir
+        env['CC'] = 'clang'
+        env['ANDROID_NDK_HOME'] = self.ctx.ndk_dir
         return env
 
     def select_build_arch(self, arch):

pythonforandroid/recipes/pygame/__init__.py

@@ -28,9 +28,7 @@ def prebuild_arch(self, arch):
         with current_directory(self.get_build_dir(arch.arch)):
             setup_template = open(join("buildconfig", "Setup.Android.SDL2.in")).read()
             env = self.get_recipe_env(arch)
-            env['ANDROID_ROOT'] = join(self.ctx.ndk_platform, 'usr')
-
-            ndk_lib_dir = join(self.ctx.ndk_platform, 'usr', 'lib')
+            env['ANDROID_ROOT'] = join(arch.ndk_platform, 'usr')
 
             png = self.get_recipe('png', self.ctx)
             png_lib_dir = join(png.get_build_dir(arch.arch), '.libs')
@@ -43,7 +41,7 @@ def prebuild_arch(self, arch):
                 sdl_includes=(
                     " -I" + join(self.ctx.bootstrap.build_dir, 'jni', 'SDL', 'include') +
                     " -L" + join(self.ctx.bootstrap.build_dir, "libs", str(arch)) +
-                    " -L" + png_lib_dir + " -L" + jpeg_lib_dir + " -L" + ndk_lib_dir),
+                    " -L" + png_lib_dir + " -L" + jpeg_lib_dir + " -L" + arch.ndk_lib_dir),
                 sdl_ttf_includes="-I"+join(self.ctx.bootstrap.build_dir, 'jni', 'SDL2_ttf'),
                 sdl_image_includes="-I"+join(self.ctx.bootstrap.build_dir, 'jni', 'SDL2_image'),
                 sdl_mixer_includes="-I"+join(self.ctx.bootstrap.build_dir, 'jni', 'SDL2_mixer'),