Derive Android platforms version from Android build-tools version

This should help us keep the two in sync if the latter changes one
day.
This commit is contained in:
Ben Liblit 2018-02-08 11:48:28 -06:00
parent 18a4edd84e
commit 9b5cc743fe
1 changed files with 13 additions and 13 deletions

View File

@ -35,19 +35,6 @@ task unpackAndroidSdk(type: Sync, dependsOn: verifyAndroidSdk) {
into temporaryDir
}
task installAndroidPlatforms(type: Exec, dependsOn: unpackAndroidSdk) {
def manager = "${unpackAndroidSdk.outputs.files[0]}/tools/bin/sdkmanager"
ext.version = 'android-26'
commandLine 'sh', '-ceu', "yes 2>/dev/null | $manager platforms\\;$version >/dev/null"
inputs.dir "${unpackAndroidSdk.outputs.files[0]}/tools"
outputs.dir "${unpackAndroidSdk.outputs.files[0]}/platforms"
}
task copyAndroidJar(type: Sync, dependsOn: installAndroidPlatforms) {
from "${installAndroidPlatforms.outputs.files[0]}/${installAndroidPlatforms.version}/android.jar"
into temporaryDir
}
task installAndroidBuildTools(type: Exec, dependsOn: unpackAndroidSdk) {
def manager = "${unpackAndroidSdk.outputs.files[0]}/tools/bin/sdkmanager"
ext.version = '26.0.2'
@ -61,6 +48,19 @@ task copyDxJar(type: Sync, dependsOn: installAndroidBuildTools) {
into 'lib'
}
task installAndroidPlatforms(type: Exec, dependsOn: unpackAndroidSdk) {
def manager = "${unpackAndroidSdk.outputs.files[0]}/tools/bin/sdkmanager"
ext.version = "android-${installAndroidBuildTools.version.tokenize('.')[0]}"
commandLine 'sh', '-ceu', "yes 2>/dev/null | $manager platforms\\;$version >/dev/null"
inputs.dir "${unpackAndroidSdk.outputs.files[0]}/tools"
outputs.dir "${unpackAndroidSdk.outputs.files[0]}/platforms"
}
task copyAndroidJar(type: Sync, dependsOn: installAndroidPlatforms) {
from "${installAndroidPlatforms.outputs.files[0]}/${installAndroidPlatforms.version}/android.jar"
into temporaryDir
}
task downloadSampleCup(type: Download) {
src 'http://www.cc.gatech.edu/gvu/people/faculty/hudson/java_cup/classes.v0.9e/java_cup/parser.cup'
dest 'data/sample.cup'