Get --add-source working for dirs in Gradle builds (kivy#2156)

kollivier · inclement · web-flow · commit 36825d7ffe91 · 2020-04-29T18:33:20.000+01:00
* Switch to using Gradle srcDir props for extra source dirs.

* Add warning about only supporting source dir includes with gradle.

* Fixed typos in gradle source directory warning

Co-authored-by: Alexander Taylor &lt;alexanderjohntaylor@gmail.com&gt;
diff --git a/pythonforandroid/bootstraps/common/build/build.py b/pythonforandroid/bootstraps/common/build/build.py
@@ -380,6 +380,9 @@ def make_package(args):
         for spec in args.extra_source_dirs:
             if ':' in spec:
                 specdir, specincludes = spec.split(':')
+                print('WARNING: Currently gradle builds only support including source '
+                      'directories, so when building using gradle all files in '
+                      '{} will be included.'.format(specdir))
             else:
                 specdir = spec
                 specincludes = '**'
diff --git a/pythonforandroid/bootstraps/common/build/templates/build.tmpl.gradle b/pythonforandroid/bootstraps/common/build/templates/build.tmpl.gradle
@@ -85,6 +85,13 @@ android {
     sourceSets {
         main {
             jniLibs.srcDir 'libs'
+            java {
+
+                {%- for adir, pattern in args.extra_source_dirs -%}
+                    srcDir '{{adir}}'
+                {%- endfor -%}
+
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,13 @@ android {`
`85`	`85`	`sourceSets {`
`86`	`86`	`main {`
`87`	`87`	`jniLibs.srcDir 'libs'`
	`88`	`+ java {`
	`89`	`+`
	`90`	`+ {%- for adir, pattern in args.extra_source_dirs -%}`
	`91`	`+ srcDir '{{adir}}'`
	`92`	`+ {%- endfor -%}`
	`93`	`+`
	`94`	`+ }`
`88`	`95`	`}`
`89`	`96`	`}`
`90`	`97`