Skip to content

Add manifestPlaceholders #2301

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.

Sign up for GitHub

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

Merged
AndreMiras merged 1 commit into from
Aug 20, 2020
Merged

Add manifestPlaceholders #2301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions pythonforandroid/bootstraps/common/build/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,6 +761,9 @@ def parse_args_and_make_package(args=None):
ap.add_argument('--extra-manifest-xml', default='',
help=('Extra xml to write directly inside the <manifest> element of'
'AndroidManifest.xml'))
ap.add_argument('--manifest-placeholders', dest='manifest_placeholders',
default='[:]', help=('Inject build variables into the manifest '
'via the manifestPlaceholders property'))

# Put together arguments, and add those from .p4a config file:
if args is None:
Expand Down
1 change: 1 addition & 0 deletions pythonforandroid/bootstraps/common/build/templates/build.tmpl.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ android {
targetSdkVersion {{ android_api }}
versionCode {{ args.numeric_version }}
versionName '{{ args.version }}'
manifestPlaceholders = {{ args.manifest_placeholders}}
Copy link
Member

@AndreMiras AndreMiras Aug 19, 2020

Choose a reason for hiding this comment

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

I didn't get a chance to check, but I assume this default behaviour you introduced doesn't break anything right?
Could you try to run the auto-compiled test apps on device and confirm it's not breaking?

Copy link
Member Author

@misl6 misl6 Aug 19, 2020

Choose a reason for hiding this comment

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

It just adds an empty map, so it shouldn't break anything.
BTW, I just downloaded the artifact for arm64-v8a and it works flawlessly.

Copy link
Member

@AndreMiras AndreMiras Aug 20, 2020

Choose a reason for hiding this comment

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

Nice thanks for giving a try, let's merge 🚀

}

{% if debug_build -%}
Expand Down