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

Add manifestPlaceholders feature #1212

Merged
merged 1 commit into from
Dec 14, 2020

Conversation

misl6
Copy link
Member

@misl6 misl6 commented Aug 19, 2020

Needs kivy/python-for-android#2301 to be merged.

This PR adds the support for manifestPlaceholders feature that's it's now implemented in python-for-android

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.

Thanks for the changes.
Could you look into the failing integration test?

2020-08-19T16:44:44.3292064Z usage: toolchain.py [-h] [--private PRIVATE] --package PACKAGE --name NAME
2020-08-19T16:44:44.3292703Z                     [--numeric-version NUMERIC_VERSION] --version VERSION
2020-08-19T16:44:44.3293195Z                     [--launcher] [--permission PERMISSIONS [PERMISSIONS ...]]
2020-08-19T16:44:44.3293647Z                     [--meta-data META_DATA] [--uses-library ANDROID_USED_LIBS]
2020-08-19T16:44:44.3294088Z                     [--asset /path/to/source:dest] [--icon ICON]
2020-08-19T16:44:44.3294526Z                     [--service SERVICES] [--native-service NATIVE_SERVICES]
2020-08-19T16:44:44.3294952Z                     [--presplash PRESPLASH]
2020-08-19T16:44:44.3295376Z                     [--presplash-color PRESPLASH_COLOR] [--window]
2020-08-19T16:44:44.3295771Z                     [--orientation ORIENTATION]
2020-08-19T16:44:44.3296203Z                     [--android-entrypoint ANDROID_ENTRYPOINT]
2020-08-19T16:44:44.3296603Z                     [--android-apptheme ANDROID_APPTHEME]
2020-08-19T16:44:44.3297012Z                     [--add-compile-option COMPILE_OPTIONS]
2020-08-19T16:44:44.3297434Z                     [--add-gradle-repository GRADLE_REPOSITORIES]
2020-08-19T16:44:44.3297878Z                     [--add-packaging-option PACKAGING_OPTIONS] [--wakelock]
2020-08-19T16:44:44.3298380Z                     [--blacklist BLACKLIST] [--whitelist WHITELIST]
2020-08-19T16:44:44.3298811Z                     [--release] [--with-debug-symbols] [--add-jar ADD_JAR]
2020-08-19T16:44:44.3299255Z                     [--add-aar ADD_AAR] [--depend DEPENDS] [--sdk SDK_VERSION]
2020-08-19T16:44:44.3299663Z                     [--minsdk MIN_SDK_VERSION]
2020-08-19T16:44:44.3300065Z                     [--allow-minsdk-ndkapi-mismatch]
2020-08-19T16:44:44.3300479Z                     [--intent-filters INTENT_FILTERS]
2020-08-19T16:44:44.3300884Z                     [--with-billing BILLING_PUBKEY]
2020-08-19T16:44:44.3301283Z                     [--add-source EXTRA_SOURCE_DIRS]
2020-08-19T16:44:44.3301716Z                     [--try-system-python-compile] [--no-compile-pyo] [--sign]
2020-08-19T16:44:44.3302105Z                     [--add-activity ADD_ACTIVITY]
2020-08-19T16:44:44.3302540Z                     [--activity-launch-mode ACTIVITY_LAUNCH_MODE]
2020-08-19T16:44:44.3302950Z                     [--allow-backup ALLOW_BACKUP] [--no-optimize-python]
2020-08-19T16:44:44.3303369Z                     [--extra-manifest-xml EXTRA_MANIFEST_XML]
2020-08-19T16:44:44.3303782Z toolchain.py: error: unrecognized arguments: --manifest-placeholders [:]
2020-08-19T16:44:44.3515704Z # Command failed: /opt/hostedtoolcache/Python/3.8.5/x64/bin/python -m pythonforandroid.toolchain apk --debug --bootstrap=sdl2 --dist_name myapp --name 'My Application' --version 0.1 --package org.test.myapp --minsdk 21 --ndk-api 21 --private /home/runner/work/buildozer/buildozer/.buildozer/android/app --android-entrypoint org.kivy.android.PythonActivity --android-apptheme @android:style/Theme.NoTitleBar --orientation portrait --window --copy-libs --manifest-placeholders [:] --arch armeabi-v7a --color=always --storage-dir="/home/runner/work/buildozer/buildozer/.buildozer/android/platform/build-armeabi-v7a" --ndk-api=21

Edit, OK I realise you addressed it in kivy/python-for-android#2301

@misl6
Copy link
Member Author

misl6 commented Aug 20, 2020

@AndreMiras Yes, the tests are not going to be green until kivy/python-for-android#2301 is merged into p4a/develop .

I'm going to force the tests again, after kivy/python-for-android#2301 it's merged.

@misl6 misl6 force-pushed the feature/manifestPlaceholders branch from 424bb05 to 6f787eb Compare August 20, 2020 15:39
@AndreMiras
Copy link
Member

Now I realise default p4a.branch is master so yes that doesn't work either after merge. We probably want p4a.branch = develop for integration tests I guess. Fix shouldn't be that hard I think.
Maybe you could try something similar to https://github.com/kivy/buildozer/blob/020a550/.github/workflows/android.yml#L25

@misl6 misl6 force-pushed the feature/manifestPlaceholders branch 2 times, most recently from 954519e to e6577ce Compare December 8, 2020 20:19
@misl6 misl6 force-pushed the feature/manifestPlaceholders branch from e6577ce to 80d53a2 Compare December 11, 2020 18:28
@misl6 misl6 requested a review from AndreMiras December 11, 2020 22:26
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.

LGTM, thanks for the follow-up and rebasing.
I've added a minor question

buildozer/targets/android.py Show resolved Hide resolved
@misl6 misl6 merged commit b60055c into kivy:master Dec 14, 2020
@inclement
Copy link
Member

This is causing buildozer to fail for people not using python-for-android master. I think we should revert and make this option only do something if a value is explicitly set by the user.

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