Made gradle use correct build tools and target sdk versions

Author: inclement

pythonforandroid/bootstraps/sdl2_gradle/build/build.py

@@ -4,14 +4,15 @@
 from __future__ import print_function
 from os.path import (
     dirname, join, isfile, realpath, relpath, split, exists, basename)
-from os import makedirs
+from os import makedirs, remove, listdir
 import os
 import tarfile
 import time
 import subprocess
 import shutil
 from zipfile import ZipFile
 import sys
+from distutils.version import LooseVersion
 
 from fnmatch import fnmatch
 
@@ -334,6 +335,21 @@ def make_package(args):
             sticky=sticky,
             service_id=sid + 1)
 
+    # Find the SDK directory and target API
+    with open('project.properties', 'r') as fileh:
+        target = fileh.read().strip()
+    android_api = target.split('-')[1]
+    with open('local.properties', 'r') as fileh:
+        sdk_dir = fileh.read().strip()
+    sdk_dir = sdk_dir[8:]
+
+    # Try to build with the newest available build tools
+    build_tools_versions = listdir(join(sdk_dir, 'build-tools'))
+    build_tools_versions = sorted(build_tools_versions,
+                                  key=LooseVersion)
+    build_tools_version = build_tools_versions[-1]
+
+
     render(
         'AndroidManifest.tmpl.xml',
         'src/main/AndroidManifest.xml',
@@ -342,6 +358,14 @@ def make_package(args):
         service_names=service_names,
         url_scheme=url_scheme)
 
+    # Copy the AndroidManifest.xml to the dist root dir so that ant
+    # can also use it
+    if exists('AndroidManifest.xml'):
+        remove('AndroidManifest.xml')
+    shutil.copy(join('src', 'main', 'AndroidManifest.xml'),
+                'AndroidManifest.xml')
+        
+
     render(
         'strings.tmpl.xml',
         'src/main/res/values/strings.xml',
@@ -354,7 +378,9 @@ def make_package(args):
         'build.tmpl.gradle',
         'build.gradle',
         args=args,
-        aars=aars)
+        aars=aars,
+        android_api=android_api,
+        build_tools_version=build_tools_version)
 
     ## ant build templates
     render(
@@ -454,9 +480,11 @@ def parse_args(args=None):
     ap.add_argument('--depend', dest='depends', action='append',
                     help=('Add a external dependency '
                           '(eg: com.android.support:appcompat-v7:19.0.1)'))
-    ap.add_argument('--sdk', dest='sdk_version', default=-1,
-                    type=int, help=('Android SDK version to use. Default to '
-                                    'the value of minsdk'))
+    ## The --sdk option has been removed, it is ignored in favour of
+    ## --android-api handled by toolchain.py
+    # ap.add_argument('--sdk', dest='sdk_version', default=-1,
+    #                 type=int, help=('Android SDK version to use. Default to '
+    #                                 'the value of minsdk'))
     ap.add_argument('--minsdk', dest='min_sdk_version',
                     default=default_android_api, type=int,
                     help=('Minimum Android SDK version to use. Default to '
@@ -487,8 +515,8 @@ def parse_args(args=None):
     if args.name and args.name[0] == '"' and args.name[-1] == '"':
         args.name = args.name[1:-1]
 
-    if args.sdk_version == -1:
-        args.sdk_version = args.min_sdk_version
+    # if args.sdk_version == -1:
+    #     args.sdk_version = args.min_sdk_version
 
     if args.permissions is None:
         args.permissions = []

pythonforandroid/bootstraps/sdl2_gradle/build/templates/build.tmpl.gradle

@@ -20,11 +20,11 @@ allprojects {
 apply plugin: 'com.android.application'
 
 android {
-	compileSdkVersion {{ args.sdk_version }}
-	buildToolsVersion '25.0.3'
+	compileSdkVersion {{ android_api }}
+	buildToolsVersion {{ build_tools_version }}
 	defaultConfig {
 		minSdkVersion {{ args.min_sdk_version }}
-		targetSdkVersion {{ args.sdk_version }}
+		targetSdkVersion {{ android_api }}
 		versionCode {{ args.numeric_version }}
 		versionName '{{ args.version }}'
 	}