Skip to content

Allow Python 3 To Be Built On Non-ARM Architectures#1481

Merged
inclement merged 9 commits intokivy:masterfrom
TheBrokenRail:patch-4
Dec 3, 2018
Merged

Allow Python 3 To Be Built On Non-ARM Architectures#1481
inclement merged 9 commits intokivy:masterfrom
TheBrokenRail:patch-4

Conversation

@TheBrokenRail
Copy link
Contributor

This makes it no longer hardcoded to build on ARM.

@inclement
Copy link
Member

Thanks, would you mind fixing the minor style errors Travis has flagged up via flake8?

@TheBrokenRail
Copy link
Contributor Author

I'm not sure I understand what caused the Travis tests to fail.

platform_dir = join(self.ctx.ndk_dir, 'platforms', platform_name, arch.platform_dir)
toolchain = '{android_host}-4.9'.format(android_host=arch.toolchain_prefix)
toolchain = join(self.ctx.ndk_dir, 'toolchains', toolchain, 'prebuilt', 'linux-x86_64')

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

W293 blank line contains whitespace

if target_data[0] == 'arm':
target_data[0] = 'armv7a'
target = '-'.join([target_data[0], 'none', target_data[1], target_data[2]])

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

W293 blank line contains whitespace

@AndreMiras
Copy link
Member

Thanks for the PR, here is the linting error:

pythonforandroid/recipes/python3/__init__.py:75:1: W293 blank line contains whitespace
pythonforandroid/recipes/python3/__init__.py:80:1: W293 blank line contains whitespace

You can always run tox locally before PR to check that.

@TheBrokenRail
Copy link
Contributor Author

Fixed Lint!

@inclement inclement merged commit 6be6853 into kivy:master Dec 3, 2018
@inclement
Copy link
Member

Sorry for the delay, I thought this had been merged already. Thanks again!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants