Merge pull request kivy#1211 from bauerj/add-jar

inclement · web-flow · commit 275d2360840b · 2018-01-20T15:48:27.000Z
Include jar files in build.gradle
diff --git a/pythonforandroid/bootstraps/sdl2/build/build.py b/pythonforandroid/bootstraps/sdl2/build/build.py
@@ -261,14 +261,15 @@ def make_package(args):
     shutil.copy(args.presplash or default_presplash,
                 'src/main/res/drawable/presplash.jpg')
 
+    jars = []
     # If extra Java jars were requested, copy them into the libs directory
     if args.add_jar:
         for jarname in args.add_jar:
             if not exists(jarname):
                 print('Requested jar does not exist: {}'.format(jarname))
                 sys.exit(-1)
             shutil.copy(jarname, 'src/main/libs')
-
+            jars.append(basename(jarname))
     # if extra aar were requested, copy them into the libs directory
     aars = []
     if args.add_aar:
@@ -381,6 +382,7 @@ def make_package(args):
         'build.gradle',
         args=args,
         aars=aars,
+        jars=jars,
         android_api=android_api,
         build_tools_version=build_tools_version)
 
diff --git a/pythonforandroid/bootstraps/sdl2/build/templates/build.tmpl.gradle b/pythonforandroid/bootstraps/sdl2/build/templates/build.tmpl.gradle
@@ -67,6 +67,9 @@ dependencies {
 	{%- for aar in aars %}
 	compile(name: '{{ aar }}', ext: 'aar')
 	{%- endfor -%}
+        {%- for jar in jars %}
+        compile files('src/main/libs/{{ jar }}')
+        {%- endfor -%}
 	{%- if args.depends -%}
 	{%- for depend in args.depends %}
 	compile '{{ depend }}'
