Merged
Conversation
AndreMiras
reviewed
Mar 29, 2020
zworkb
force-pushed
the
android-library
branch
2 times, most recently
from
09cdd92 to
13287b2
Compare
rnixx
reviewed
Mar 30, 2020
| # If no launcher is specified, require a main.py/main.pyo: | ||
| if (get_bootstrap_name() != "sdl" or args.launcher is None) and \ | ||
| get_bootstrap_name() != "webview": | ||
| get_bootstrap_name() not in ["webview", "service_library"]: |
Member
There was a problem hiding this comment.
This look like it should be a setting on the bootstrap.
rnixx
reviewed
Mar 30, 2020
inclement
requested changes
Mar 30, 2020
Member
inclement
left a comment
inclement
left a comment
There was a problem hiding this comment.
I originally limited the symlinking to the java source because that was the only thing I found useful to link that way, and I wasn't sure if all the android tools would be happy to work on symlinks. If you can vouch that symlinking more stuff works okay, then I don't see an issue.
Member
|
This looks good to me, just a few minor comments in the review. |
zworkb
force-pushed
the
android-library
branch
6 times, most recently
from
8d51362 to
42e05d1
Compare
* ported @xuhcc's PR 1063 to recent p4a master * bootstraps dirs are cumulatively copied based on their inheritance, can be arbitrarily deep * add symlink param to copy_files, when set the copy target are symlinked * support for the aar directive in buildozer * create a 'p4a aar' command, so that lots of cluttering conditionals can be moved away from toolchain.apk() * began to remove ant support (@inclement allowed me to do so) * renamed library bootstrap to service_library, because that describe it better * test setup setup_testlib_service.py * renamed symlink_java_src to symlink_bootstrap_files * None is not allowed as bootstrap parameter * switched tests to use the sdl2 bootstrap
inclement
approved these changes
Apr 17, 2020
Member
|
Thanks for all the rebase effort! |
AndreMiras
added a commit
to AndreMiras/python-for-android
that referenced
this pull request
May 9, 2020
Also removes unused `mActivity` member. Note we changed the constructor input parameter to accept a `Context` object which is a parent class of the previous `Activity` one. Changes were tested on both kivy and service_only bootstraps. Also removes the `get_common_dir()` as it's no longer used since kivy#2092
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
p4a support for service-backend by packaging an .aar library
This PR is built on #1963 submitted by @xuhcc who did great work in this direction, but unfortunately seems to have not the time to continue the work, so most credit goes to @xuhcc.
In the first turn I took his work and made it work from the current p4a develop (including a buildozer integration, see corresponding PR kivy/buildozer#1037)
I am willing to bring this to a form so that it can be merged and am open for discussions and happy for some good advice...
Most promising was inclement's proposal in which he proposed to pimp up the
service_onlybootstrap and move the build steps into anaarcommand.If no other advice is coming I would go that way, since the service_only bootstrap seems to fit best here, but I don't want to break anything.
I have set up a test project where this can be tested.
UPDATE:
I added support for inheritance in bootstraps, so that a bootstrap inheriting from another bootstrap only needs to ad the files that differ from the original into it's bootstrap dir.
So we avoid file duplication.
what has been done so far:
symlinkparam to copy_files, when set the copy target are symlinkedaardirective in buildozertoolchain.apk()librarybootstrap toservice_library, because that describe it bettersetup_testlib_service.py@inclement's change requests are implemented now
PR is ready to merge now