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.

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

More manifest and gradle templating #18

Merged
merged 6 commits into from
May 24, 2023
Merged

More manifest and gradle templating #18

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6a685b6
Document some manifest build options
dbnicholson May 23, 2023
455c5af
Support --extra-manifest-xml in webview and service_only bootstraps
dbnicholson May 23, 2023
f5b0ed5
Support --extra-manifest-application-arguments in webview and service…
dbnicholson May 23, 2023
e7b544c
Support debug and release specific manifestPlaceholders
dbnicholson May 23, 2023
eb31fac
Flake8 does not support inline comments for any of the keys. (#2708)
misl6 Nov 29, 2022
1762981
toml may not be available on systemwide python (#2670)
misl6 Sep 10, 2022
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
12 changes: 12 additions & 0 deletions doc/source/buildoptions.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,12 @@ options (this list may not be exhaustive):
- ``--add-source``: Add a source directory to the app's Java code.
- ``--no-compile-pyo``: Do not optimise .py files to .pyo.
- ``--enable-androidx``: Enable AndroidX support library.
- ``--extra-manifest-xml``: Extra xml to write directly inside the
``<manifest>`` element of AndroidManifest.xml.
- ``--extra-manifest-application-arguments``: Extra arguments to be
added to the ``<manifest><application>`` tag of AndroidManifest.xml.
- ``--manifest-placeholders``: Inject build variables into the manifest
via the ``manifestPlaceholders`` property.
- ``--enable-google-services``: Enable the Google Services Gradle plugin.
This option requires a ``google-services.json`` file in root of the
project directory.
Expand Down Expand Up @@ -160,6 +166,12 @@ ready.
- ``add-source``: Add a source directory to the app's Java code.
- ``--port``: The port on localhost that the WebView will
access. Defaults to 5000.
- ``--extra-manifest-xml``: Extra xml to write directly inside the
``<manifest>`` element of AndroidManifest.xml.
- ``--extra-manifest-application-arguments``: Extra arguments to be
dbnicholson marked this conversation as resolved.
Show resolved Hide resolved
added to the ``<manifest><application>`` tag of AndroidManifest.xml.
- ``--manifest-placeholders``: Inject build variables into the manifest
via the ``manifestPlaceholders`` property.
- ``--enable-google-services``: Enable the Google Services Gradle plugin.
This option requires a ``google-services.json`` file in root of the
project directory.
Expand Down
6 changes: 5 additions & 1 deletion pythonforandroid/bootstraps/service_only/build/templates/AndroidManifest.tmpl.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
<uses-permission android:name="com.android.vending.BILLING" />
{% endif %}

{{ args.extra_manifest_xml }}

<!-- Create a Java class extending SDLActivity and place it in a
directory under src matching the package, e.g.
src/com/gamemaker/game/MyGame.java
Expand All @@ -51,7 +53,9 @@
{% if args.backup_rules %}android:fullBackupContent="@xml/{{ args.backup_rules }}"{% endif %}
android:theme="{{args.android_apptheme}}{% if not args.window %}.Fullscreen{% endif %}"
android:hardwareAccelerated="true"
android:extractNativeLibs="true" >
android:extractNativeLibs="true"
{{ args.extra_manifest_application_arguments }}
>
{% for l in args.android_used_libs %}
<uses-library android:name="{{ l }}" />
{% endfor %}
Expand Down
3 changes: 3 additions & 0 deletions pythonforandroid/bootstraps/webview/build/templates/AndroidManifest.tmpl.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
<uses-permission android:name="com.android.vending.BILLING" />
{% endif %}

{{ args.extra_manifest_xml }}

<!-- Create a Java class extending SDLActivity and place it in a
directory under src matching the package, e.g.
src/com/gamemaker/game/MyGame.java
Expand All @@ -54,6 +56,7 @@
android:usesCleartextTraffic="true"
android:extractNativeLibs="true"
{% if debug %}android:debuggable="true"{% endif %}
{{ args.extra_manifest_application_arguments }}
>
{% for l in args.android_used_libs %}
<uses-library android:name="{{ l }}" />
Expand Down