Skip to content

Commit

Permalink
[NDK19] Remove --sysroot from LDFLAGS for cffi and pymunk (#1965)
Browse files Browse the repository at this point in the history
Because `--sysroot` flag is not needed anymore and make it fails the build since we migrated to new android's build system (implemented in NDK r19)

See also:
  - https://developer.android.com/ndk/guides/other_build_systems
  • Loading branch information
opacam authored and inclement committed Aug 25, 2019
1 parent 9801865 commit be8566d
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 2 deletions.
1 change: 0 additions & 1 deletion pythonforandroid/recipes/cffi/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ def get_recipe_env(self, arch=None):
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'] += " --sysroot={}".format(self.ctx.ndk_platform)
env['PYTHONPATH'] = ':'.join([
self.ctx.get_site_packages_dir(),
env['BUILDLIB_PATH'],
Expand Down
1 change: 0 additions & 1 deletion pythonforandroid/recipes/pymunk/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ def get_recipe_env(self, arch):
env['PYTHON_ROOT'] = self.ctx.get_python_install_dir()
env['LDFLAGS'] += " -shared -llog"
env['LDFLAGS'] += ' -L{}'.format(join(self.ctx.ndk_platform, 'usr', 'lib'))
env['LDFLAGS'] += " --sysroot={}".format(self.ctx.ndk_platform)
env['LIBS'] = env.get('LIBS', '') + ' -landroid'
return env

Expand Down

0 comments on commit be8566d

Please sign in to comment.