diff options
| -rw-r--r-- | avdlauncher/build.gradle | 8 | ||||
| -rw-r--r-- | emulator/mksdcard/build.gradle | 4 | ||||
| -rw-r--r-- | find_java/build.gradle | 16 | ||||
| -rw-r--r-- | sdklauncher/build.gradle | 8 |
4 files changed, 21 insertions, 15 deletions
diff --git a/avdlauncher/build.gradle b/avdlauncher/build.gradle index dc08951..c280642 100644 --- a/avdlauncher/build.gradle +++ b/avdlauncher/build.gradle @@ -19,17 +19,17 @@ sources { sdk { windows { - item( { getExeName("windows") } ) { + item( { getExeName("windows32AvdLauncherExecutable") } ) { into 'lib' name 'AVD Manager.exe' - builtBy 'avdLauncherExecutable' + builtBy 'windows32AvdLauncherExecutable' } } } -def getExeName(String platform) { +def getExeName(String name) { // binaries will return a set of binaries - def binaries = executables.avdLauncher.binaries.matching { it.name == "avdLauncherExecutable" } + def binaries = executables.avdLauncher.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) } diff --git a/emulator/mksdcard/build.gradle b/emulator/mksdcard/build.gradle index adb731a..677f763 100644 --- a/emulator/mksdcard/build.gradle +++ b/emulator/mksdcard/build.gradle @@ -35,9 +35,9 @@ sdk { } } windows { - item( { getExeName("windows") } ) { + item( { getExeName("windows32") } ) { name 'mksdcard.exe' - builtBy 'windowsMksdcardExecutable' + builtBy 'windows32MksdcardExecutable' } } } diff --git a/find_java/build.gradle b/find_java/build.gradle index b1dfa79..b359e0a 100644 --- a/find_java/build.gradle +++ b/find_java/build.gradle @@ -19,10 +19,16 @@ sources { sdk { windows { - item( { getExeName("windows") } ) { + item( { getExeName("windows32FindJavaExecutable") } ) { into 'lib' - name 'find_java.exe' - builtBy 'findJavaExecutable' + name 'find_java32.exe' + builtBy 'windows32FindJavaExecutable' + notice 'NOTICE' + } + item( { getExeName("windows64FindJavaExecutable") } ) { + into 'lib' + name 'find_java64.exe' + builtBy 'windows64FindJavaExecutable' notice 'NOTICE' } item('find_java.bat') { @@ -32,9 +38,9 @@ sdk { } } -def getExeName(String platform) { +def getExeName(String name) { // binaries will return a set of binaries - def binaries = executables.findJava.binaries.matching { it.name == "findJavaExecutable" } + def binaries = executables.findJava.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) } 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) } |