From 6a685b67a8b745f1b3f5be1495d7e2e7a96a44fc Mon Sep 17 00:00:00 2001
From: Dan Nicholson <dbn@endlessos.org>
Date: Tue, 23 May 2023 09:18:50 -0600
Subject: [PATCH 1/6] Document some manifest build options

The --extra-manifest-xml and --extra-manifest-application-arguments
options are currently only handled by the sdl2 bootstrap while the
--manifest-placeholders option is handled in the common build.gradle
template.
---
 doc/source/buildoptions.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/source/buildoptions.rst b/doc/source/buildoptions.rst
index 6497cc1d4e..ca650e9bdd 100644
--- a/doc/source/buildoptions.rst
+++ b/doc/source/buildoptions.rst
@@ -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.
@@ -160,6 +166,8 @@ 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.
+- ``--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.

From 455c5af021d453e37fa2ab7f5c44992bb9de5197 Mon Sep 17 00:00:00 2001
From: Dan Nicholson <dbn@endlessos.org>
Date: Tue, 23 May 2023 11:12:12 -0600
Subject: [PATCH 2/6] Support --extra-manifest-xml in webview and service_only
 bootstraps

---
 doc/source/buildoptions.rst                                     | 2 ++
 .../service_only/build/templates/AndroidManifest.tmpl.xml       | 2 ++
 .../bootstraps/webview/build/templates/AndroidManifest.tmpl.xml | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/doc/source/buildoptions.rst b/doc/source/buildoptions.rst
index ca650e9bdd..4f6b3a5aa3 100644
--- a/doc/source/buildoptions.rst
+++ b/doc/source/buildoptions.rst
@@ -166,6 +166,8 @@ 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.
 - ``--manifest-placeholders``: Inject build variables into the manifest
   via the ``manifestPlaceholders`` property.
 - ``--enable-google-services``: Enable the Google Services Gradle plugin.
diff --git a/pythonforandroid/bootstraps/service_only/build/templates/AndroidManifest.tmpl.xml b/pythonforandroid/bootstraps/service_only/build/templates/AndroidManifest.tmpl.xml
index d19ed32931..cc94327eda 100644
--- a/pythonforandroid/bootstraps/service_only/build/templates/AndroidManifest.tmpl.xml
+++ b/pythonforandroid/bootstraps/service_only/build/templates/AndroidManifest.tmpl.xml
@@ -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
diff --git a/pythonforandroid/bootstraps/webview/build/templates/AndroidManifest.tmpl.xml b/pythonforandroid/bootstraps/webview/build/templates/AndroidManifest.tmpl.xml
index 0a7502bdae..9f878f4fd9 100644
--- a/pythonforandroid/bootstraps/webview/build/templates/AndroidManifest.tmpl.xml
+++ b/pythonforandroid/bootstraps/webview/build/templates/AndroidManifest.tmpl.xml
@@ -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

From f5b0ed5bcef55bd8958bda6838aaa204067d8393 Mon Sep 17 00:00:00 2001
From: Dan Nicholson <dbn@endlessos.org>
Date: Tue, 23 May 2023 11:15:03 -0600
Subject: [PATCH 3/6] Support --extra-manifest-application-arguments in webview
 and service_only

---
 doc/source/buildoptions.rst                                   | 2 ++
 .../service_only/build/templates/AndroidManifest.tmpl.xml     | 4 +++-
 .../webview/build/templates/AndroidManifest.tmpl.xml          | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/doc/source/buildoptions.rst b/doc/source/buildoptions.rst
index 4f6b3a5aa3..7013653ca9 100644
--- a/doc/source/buildoptions.rst
+++ b/doc/source/buildoptions.rst
@@ -168,6 +168,8 @@ ready.
   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
+  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.
diff --git a/pythonforandroid/bootstraps/service_only/build/templates/AndroidManifest.tmpl.xml b/pythonforandroid/bootstraps/service_only/build/templates/AndroidManifest.tmpl.xml
index cc94327eda..08da63348d 100644
--- a/pythonforandroid/bootstraps/service_only/build/templates/AndroidManifest.tmpl.xml
+++ b/pythonforandroid/bootstraps/service_only/build/templates/AndroidManifest.tmpl.xml
@@ -53,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 %}
diff --git a/pythonforandroid/bootstraps/webview/build/templates/AndroidManifest.tmpl.xml b/pythonforandroid/bootstraps/webview/build/templates/AndroidManifest.tmpl.xml
index 9f878f4fd9..6f703810f1 100644
--- a/pythonforandroid/bootstraps/webview/build/templates/AndroidManifest.tmpl.xml
+++ b/pythonforandroid/bootstraps/webview/build/templates/AndroidManifest.tmpl.xml
@@ -56,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 }}" />

From e7b544c2313cf582708d4277b2aa3f926228eea3 Mon Sep 17 00:00:00 2001
From: Dan Nicholson <dbn@endlessos.org>
Date: Tue, 23 May 2023 08:28:53 -0600
Subject: [PATCH 4/6] Support debug and release specific manifestPlaceholders

This allows having separate placeholders for debug and release builds.
That can be useful for changing manifest features based on the build
type.
---
 doc/source/buildoptions.rst                          | 10 ++++++++++
 pythonforandroid/bootstraps/common/build/build.py    | 12 ++++++++++++
 .../common/build/templates/build.tmpl.gradle         |  2 ++
 3 files changed, 24 insertions(+)

diff --git a/doc/source/buildoptions.rst b/doc/source/buildoptions.rst
index 7013653ca9..dec55cddee 100644
--- a/doc/source/buildoptions.rst
+++ b/doc/source/buildoptions.rst
@@ -97,6 +97,11 @@ options (this list may not be exhaustive):
   added to the ``<manifest><application>`` tag of AndroidManifest.xml.
 - ``--manifest-placeholders``: Inject build variables into the manifest
   via the ``manifestPlaceholders`` property.
+- ``--debug-manifest-placeholders``: Inject build variables into the
+  manifest via the manifestPlaceholders property in the debug buildType.
+- ``--release-manifest-placeholders``: Inject build variables into the
+  manifest via the manifestPlaceholders property in the release
+  buildType.
 - ``--enable-google-services``: Enable the Google Services Gradle plugin.
   This option requires a ``google-services.json`` file in root of the
   project directory.
@@ -172,6 +177,11 @@ ready.
   added to the ``<manifest><application>`` tag of AndroidManifest.xml.
 - ``--manifest-placeholders``: Inject build variables into the manifest
   via the ``manifestPlaceholders`` property.
+- ``--debug-manifest-placeholders``: Inject build variables into the
+  manifest via the manifestPlaceholders property in the debug buildType.
+- ``--release-manifest-placeholders``: Inject build variables into the
+  manifest via the manifestPlaceholders property in the release
+  buildType.
 - ``--enable-google-services``: Enable the Google Services Gradle plugin.
   This option requires a ``google-services.json`` file in root of the
   project directory.
diff --git a/pythonforandroid/bootstraps/common/build/build.py b/pythonforandroid/bootstraps/common/build/build.py
index d6868083fa..1107cd000f 100755
--- a/pythonforandroid/bootstraps/common/build/build.py
+++ b/pythonforandroid/bootstraps/common/build/build.py
@@ -876,6 +876,18 @@ def parse_args_and_make_package(args=None):
     ap.add_argument('--manifest-placeholders', dest='manifest_placeholders',
                     default='[:]', help=('Inject build variables into the manifest '
                                          'via the manifestPlaceholders property'))
+    ap.add_argument('--debug-manifest-placeholders',
+                    dest='debug_manifest_placeholders',
+                    default='[:]',
+                    help=('Inject build variables into the manifest '
+                          'via the manifestPlaceholders property '
+                          'in the debug buildType'))
+    ap.add_argument('--release-manifest-placeholders',
+                    dest='release_manifest_placeholders',
+                    default='[:]',
+                    help=('Inject build variables into the manifest '
+                          'via the manifestPlaceholders property '
+                          'in the release buildType'))
     ap.add_argument('--service-class-name', dest='service_class_name', default=DEFAULT_PYTHON_SERVICE_JAVA_CLASS,
                     help='Use that parameter if you need to implement your own PythonServive Java class')
     ap.add_argument('--activity-class-name', dest='activity_class_name', default=DEFAULT_PYTHON_ACTIVITY_JAVA_CLASS,
diff --git a/pythonforandroid/bootstraps/common/build/templates/build.tmpl.gradle b/pythonforandroid/bootstraps/common/build/templates/build.tmpl.gradle
index a0b1a5fb92..ba86fe8d5d 100644
--- a/pythonforandroid/bootstraps/common/build/templates/build.tmpl.gradle
+++ b/pythonforandroid/bootstraps/common/build/templates/build.tmpl.gradle
@@ -94,6 +94,7 @@ android {
 
     buildTypes {
         debug {
+            manifestPlaceholders = {{ args.debug_manifest_placeholders }}
             {% if args.enable_crashlytics_native_symbol_upload -%}
             firebaseCrashlytics {
                 nativeSymbolUploadEnabled true
@@ -105,6 +106,7 @@ android {
             {% if args.sign -%}
             signingConfig signingConfigs.release
             {%- endif %}
+            manifestPlaceholders = {{ args.release_manifest_placeholders }}
             {% if args.enable_crashlytics_native_symbol_upload -%}
             firebaseCrashlytics {
                 nativeSymbolUploadEnabled true

From eb31fac82a5b304b82c4eb2bd4eda0f99091199e Mon Sep 17 00:00:00 2001
From: Mirko Galimberti <me@mirkogalimberti.com>
Date: Tue, 29 Nov 2022 17:39:38 +0100
Subject: [PATCH 5/6] Flake8 does not support inline comments for any of the
 keys. (#2708)

* Flake8 does not support inline comments for any of the keys.

* Fix flake8 E741 ambiguous variable name

(cherry picked from commit 8f8cf6a4c89d0f8a53b700c6b5d299d0080ca4ec)
---
 pythonforandroid/recipe.py |  2 +-
 tox.ini                    | 24 ++++++++++++++++--------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/pythonforandroid/recipe.py b/pythonforandroid/recipe.py
index b4cd9bb3cf..299a795477 100644
--- a/pythonforandroid/recipe.py
+++ b/pythonforandroid/recipe.py
@@ -629,7 +629,7 @@ def install_libs(self, arch, *libs):
         shprint(sh.cp, *args)
 
     def has_libs(self, arch, *libs):
-        return all(map(lambda l: self.ctx.has_lib(arch.arch, l), libs))
+        return all(map(lambda lib: self.ctx.has_lib(arch.arch, lib), libs))
 
     def get_libraries(self, arch_name, in_context=False):
         """Return the full path of the library depending on the architecture.
diff --git a/tox.ini b/tox.ini
index ceafe446b5..9b0432c82b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,11 +27,19 @@ commands = flake8 pythonforandroid/ tests/ ci/ setup.py
 
 [flake8]
 ignore =
-    E123,  # Closing bracket does not match indentation of opening bracket's line
-    E124,  # Closing bracket does not match visual indentation
-    E126,  # Continuation line over-indented for hanging indent
-    E226,  # Missing whitespace around arithmetic operator
-    E402,  # Module level import not at top of file
-    E501,  # Line too long (82 > 79 characters)
-    W503,  # Line break occurred before a binary operator
-    W504   # Line break occurred after a binary operator
+    # Closing bracket does not match indentation of opening bracket's line
+    E123,
+    # Closing bracket does not match visual indentation
+    E124,
+    # Continuation line over-indented for hanging indent
+    E126,
+    # Missing whitespace around arithmetic operator
+    E226,
+    # Module level import not at top of file
+    E402,
+    # Line too long (82 > 79 characters)
+    E501,
+    # Line break occurred before a binary operator
+    W503,
+    # Line break occurred after a binary operator
+    W504

From 1762981de894ed3362aef6e29c0ae254bfcbd49c Mon Sep 17 00:00:00 2001
From: Mirko Galimberti <me@mirkogalimberti.com>
Date: Sat, 10 Sep 2022 09:07:25 +0200
Subject: [PATCH 6/6] toml may not be available on systemwide python (#2670)

(cherry picked from commit ed43cbb5554d44b99f90facecf9ef793ddf1fd59)
---
 tests/test_pythonpackage_basic.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/test_pythonpackage_basic.py b/tests/test_pythonpackage_basic.py
index 87f7759df7..63c4003f72 100644
--- a/tests/test_pythonpackage_basic.py
+++ b/tests/test_pythonpackage_basic.py
@@ -269,11 +269,15 @@ def test_systemwide_python(self):
             p2 = os.path.normpath(pybin)
             assert p1 == p2
         except RuntimeError as e:
+            # (remember this is not in a virtualenv)
+            # Some deps may not be installed, so we just avoid to raise
+            # an exception here, as a missing dep should not make the test
+            # fail.
             if "pep517" in str(e.args):
                 # System python probably doesn't have pep517 available!
-                # (remember this is not in a virtualenv)
-                # Not much we can do in that case since pythonpackage needs it,
-                # so we'll skip this particular check.
+                pass
+            elif "toml" in str(e.args):
+                # System python probably doesn't have toml available!
                 pass
             else:
                 raise