Android: Build against new build tools revisions
Whenever the SDK updates the build tools it's put inside a new subdirectory with the version number, so with every new version we would have to update the java.prf feature. Instead, we iterate over the available revisions and pick the lexicographically highest one (which is sufficient as long as the major version is double digits.) Change-Id: I2392ef6261ef36ed741c80fa6f981486e7844e0a Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
This commit is contained in:
parent
ab90eefcc0
commit
4bcef03a8d
@ -9,7 +9,13 @@ android {
|
||||
|
||||
isEmpty(BUILD_TOOLS_REVISION) {
|
||||
BUILD_TOOLS_REVISION = $$(ANDROID_BUILD_TOOLS_REVISION)
|
||||
isEmpty(BUILD_TOOLS_REVISION): BUILD_TOOLS_REVISION = 17.0.0
|
||||
isEmpty(BUILD_TOOLS_REVISION) {
|
||||
BUILD_TOOLS_REVISIONS = $$files($$SDK_ROOT/build-tools/*)
|
||||
for (REVISION, BUILD_TOOLS_REVISIONS) {
|
||||
BASENAME = $$basename(REVISION)
|
||||
greaterThan(BASENAME, $$BUILD_TOOLS_REVISION): BUILD_TOOLS_REVISION = $$BASENAME
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ANDROID_JAR_FILE = $$SDK_ROOT/platforms/$$API_VERSION_TO_USE/android.jar
|
||||
|
Loading…
Reference in New Issue
Block a user