Merge pull request kivy#2301 from misl6/feature/manifestPlaceholders

AndreMiras · web-flow · commit 5ae76764e069 · 2020-08-20T16:14:14.000+02:00
Add manifestPlaceholders
diff --git a/pythonforandroid/bootstraps/common/build/build.py b/pythonforandroid/bootstraps/common/build/build.py
@@ -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:
diff --git a/pythonforandroid/bootstraps/common/build/templates/build.tmpl.gradle b/pythonforandroid/bootstraps/common/build/templates/build.tmpl.gradle
@@ -36,6 +36,7 @@ android {
         targetSdkVersion {{ android_api }}
         versionCode {{ args.numeric_version }}
         versionName '{{ args.version }}'
+        manifestPlaceholders = {{ args.manifest_placeholders}}
     }
 
 	{% if debug_build -%}

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ android {`
`36`	`36`	`targetSdkVersion {{ android_api }}`
`37`	`37`	`versionCode {{ args.numeric_version }}`
`38`	`38`	`versionName '{{ args.version }}'`
	`39`	`+ manifestPlaceholders = {{ args.manifest_placeholders}}`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`{% if debug_build -%}`