From bcf685ba4030fa70067e829927943d113febff75 Mon Sep 17 00:00:00 2001 From: Ben Liblit Date: Wed, 7 Feb 2018 20:36:46 -0600 Subject: [PATCH] Set Android build-tools version in just one place --- com.ibm.wala.dalvik.test/build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/com.ibm.wala.dalvik.test/build.gradle b/com.ibm.wala.dalvik.test/build.gradle index 2377dd5af..a482ee4dd 100644 --- a/com.ibm.wala.dalvik.test/build.gradle +++ b/com.ibm.wala.dalvik.test/build.gradle @@ -47,13 +47,14 @@ task unpackAndroidSdk(type: Sync, dependsOn: verifyAndroidSdk) { task installAndroidBuildTools(type: Exec, dependsOn: unpackAndroidSdk) { def manager = "${unpackAndroidSdk.outputs.files[0]}/tools/bin/sdkmanager" - commandLine 'sh', '-ceu', "yes | $manager build-tools\\;26.0.2 >/dev/null" + ext.version = '26.0.2' + commandLine 'sh', '-ceu', "yes | $manager build-tools\\;$version >/dev/null" inputs.dir "${unpackAndroidSdk.outputs.files[0]}/tools" outputs.dir "${unpackAndroidSdk.outputs.files[0]}/build-tools" } task copyDxJar(type: Sync, dependsOn: installAndroidBuildTools) { - from "${unpackAndroidSdk.outputs.files[0]}/build-tools/26.0.2/lib/dx.jar" + from "${installAndroidBuildTools.outputs.files[0]}/${installAndroidBuildTools.version}/lib/dx.jar" into 'lib' }