Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix getting empty "modules" directory when arch is not armeabi-v7a #1608

Merged
merged 1 commit into from
Jan 25, 2019

Conversation

j-devel
Copy link
Contributor

@j-devel j-devel commented Jan 25, 2019

In create_python_bundle(), copy source path of built modules (*.so) is hardcoded to arm. This results in an empty modules directory when build arch is other than armeabi-v7a.

This PR fixes the above issue; accordingly, the modules directory is generated as expected (when arch is x86, x86_64,arm64-v8a, etc).

Copy link
Member

@AndreMiras AndreMiras left a comment

Choose a reason for hiding this comment

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

One hardcoded arm less, well done!
It looks good even though playing with the command_prefix string feels a bit hacky, I didn't see what else we could use.
I've restart the build that was flaky and will merge if it goes green.
Thanks!

@AndreMiras AndreMiras merged commit f2a18a8 into kivy:master Jan 25, 2019
@AndreMiras
Copy link
Member

Merged thanks!

@j-devel
Copy link
Contributor Author

j-devel commented Jan 26, 2019

Thanks!

playing with the command_prefix string feels a bit hacky, I didn't see what else we could use.

Indeed. In future, if this arch.command_prefix.split('-')[0] stuff starts appearing multiple times in other part of code, I think it's time to consider refactoring it as a member/method of the Arch class.

@j-devel j-devel deleted the fix-modules-empty branch January 26, 2019 04:11
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.

2 participants