From 7e2d7ca5e7bc20a279fbac22850c511f816909dd Mon Sep 17 00:00:00 2001 From: Johann Bauer Date: Wed, 27 Dec 2017 22:05:12 +0100 Subject: [PATCH] Include jar files in build.gradle --- pythonforandroid/bootstraps/sdl2/build/build.py | 4 +++- .../bootstraps/sdl2/build/templates/build.tmpl.gradle | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pythonforandroid/bootstraps/sdl2/build/build.py b/pythonforandroid/bootstraps/sdl2/build/build.py index 12f7042d8d..d7ec42d2db 100755 --- a/pythonforandroid/bootstraps/sdl2/build/build.py +++ b/pythonforandroid/bootstraps/sdl2/build/build.py @@ -261,6 +261,7 @@ 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: @@ -268,7 +269,7 @@ def make_package(args): 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: @@ -379,6 +380,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 index ee7f9395dd..70a861b91d 100644 --- a/pythonforandroid/bootstraps/sdl2/build/templates/build.tmpl.gradle +++ b/pythonforandroid/bootstraps/sdl2/build/templates/build.tmpl.gradle @@ -62,6 +62,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 }}'