aboutsummaryrefslogtreecommitdiffstats
path: root/sdklauncher
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@google.com>2014-11-14 00:15:34 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-11-14 00:15:34 +0000
commit7e91a740cb092a020c1bb6e99982e162741ffd61 (patch)
tree8ad072cb4bfcdb82ef20ca9c7743358026b1902c /sdklauncher
parent3e5c7f75410804bad5497e20e307c78b47a3c16a (diff)
parent8e66edff331244d3a1ad3847e774f98cd342485d (diff)
downloadsdk-7e91a740cb092a020c1bb6e99982e162741ffd61.zip
sdk-7e91a740cb092a020c1bb6e99982e162741ffd61.tar.gz
sdk-7e91a740cb092a020c1bb6e99982e162741ffd61.tar.bz2
Merge "Build and package 32/64bit find_java." into studio-1.0-dev
Diffstat (limited to 'sdklauncher')
-rw-r--r--sdklauncher/build.gradle8
1 files changed, 4 insertions, 4 deletions
diff --git a/sdklauncher/build.gradle b/sdklauncher/build.gradle
index 61b41e1..6c64f6d 100644
--- a/sdklauncher/build.gradle
+++ b/sdklauncher/build.gradle
@@ -19,17 +19,17 @@ sources {
sdk {
windows {
- item( { getExeName("windows") } ) {
+ item( { getExeName("windows32SdkLauncherExecutable") } ) {
into 'lib'
name 'SDK Manager.exe'
- builtBy 'sdkLauncherExecutable'
+ builtBy 'windows32SdkLauncherExecutable'
}
}
}
-def getExeName(String platform) {
+def getExeName(String name) {
// binaries will return a set of binaries
- def binaries = executables.sdkLauncher.binaries.matching { it.name == "sdkLauncherExecutable" }
+ def binaries = executables.sdkLauncher.binaries.matching { it.name == name }
// calling .exeFile on the set returns an array with the result from each item in the set...
return binaries.executableFile.get(0)
}