aboutsummaryrefslogtreecommitdiffstats
path: root/sdklauncher
diff options
context:
space:
mode:
authorRaymond Chiu <chiur@google.com>2015-02-06 13:49:12 -0800
committerRaymond Chiu <chiur@google.com>2015-02-10 11:38:49 -0800
commit7f3cb91779907c12d02e8e5c5f4a6a7c510d210e (patch)
treeb72aee78010fda9934bf861164a2707d6efe50b1 /sdklauncher
parente50f48d93f311c7143a051e2244d68c9f19507c5 (diff)
downloadsdk-7f3cb91779907c12d02e8e5c5f4a6a7c510d210e.zip
sdk-7f3cb91779907c12d02e8e5c5f4a6a7c510d210e.tar.gz
sdk-7f3cb91779907c12d02e8e5c5f4a6a7c510d210e.tar.bz2
Add targetPlatform for executable binaries
Make dsl changes due to gradle update. Change-Id: I65729783f5c8f985ed31a231e7dd9a0b9e50f7b3
Diffstat (limited to 'sdklauncher')
-rw-r--r--sdklauncher/build.gradle30
1 files changed, 14 insertions, 16 deletions
diff --git a/sdklauncher/build.gradle b/sdklauncher/build.gradle
index 6c64f6d..b04ee05 100644
--- a/sdklauncher/build.gradle
+++ b/sdklauncher/build.gradle
@@ -2,35 +2,33 @@ apply plugin: 'c'
apply plugin: 'sdk-files'
apply plugin: 'windows-setup'
-executables {
- sdkLauncher {}
-}
-
-sources {
- sdkLauncher {
- c {
- source {
- srcDir "src/source"
- include "**/*.c"
+model {
+ components {
+ sdkLauncher(NativeExecutableSpec) {
+ sources {
+ c {
+ source {
+ srcDir "src/source"
+ include "**/*.c"
+ }
+ }
}
+ targetPlatform "windows32"
}
}
}
sdk {
windows {
- item( { getExeName("windows32SdkLauncherExecutable") } ) {
+ item( { getExeName("sdkLauncherExecutable") } ) {
into 'lib'
name 'SDK Manager.exe'
- builtBy 'windows32SdkLauncherExecutable'
+ builtBy 'sdkLauncherExecutable'
}
}
}
def getExeName(String name) {
- // binaries will return a set of binaries
- 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)
+ return binaries.getByName(name).executableFile
}