diff options
author | Raymond Chiu <chiur@google.com> | 2015-02-10 20:53:45 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-02-10 20:53:45 +0000 |
commit | 1d8f0243a3c2730f8a33db8e9db957369a818d53 (patch) | |
tree | 7b55b3fef0f7e76ee5d19942250fc69548fa97a2 /emulator | |
parent | 8ab5c13b8161ecb1dab460b8b2b9020f17eef790 (diff) | |
parent | 95fc7621288e7bd695b41a8b0c4ec589d94c86d8 (diff) | |
download | sdk-1d8f0243a3c2730f8a33db8e9db957369a818d53.zip sdk-1d8f0243a3c2730f8a33db8e9db957369a818d53.tar.gz sdk-1d8f0243a3c2730f8a33db8e9db957369a818d53.tar.bz2 |
Merge "Add targetPlatform for executable binaries" into studio-1.2-dev automerge: f7757fb
automerge: 95fc762
* commit '95fc7621288e7bd695b41a8b0c4ec589d94c86d8':
Add targetPlatform for executable binaries
Diffstat (limited to 'emulator')
-rw-r--r-- | emulator/mksdcard/build.gradle | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/emulator/mksdcard/build.gradle b/emulator/mksdcard/build.gradle index 677f763..bd029b2 100644 --- a/emulator/mksdcard/build.gradle +++ b/emulator/mksdcard/build.gradle @@ -2,17 +2,20 @@ apply plugin: 'c' apply plugin: 'sdk-files' apply plugin: 'native-setup' -executables { - mksdcard {} -} - -sources { - mksdcard { - c { - source { - srcDir "src/source" - include "**/*.c" +model { + components { + mksdcard(NativeExecutableSpec) { + sources { + c { + source { + srcDir "src/source" + include "**/*.c" + } + } } + targetPlatform "darwin" + targetPlatform "linux" + targetPlatform "windows32" } } } @@ -43,9 +46,6 @@ sdk { } def getExeName(String platform) { - // binaries will return a set of binaries - def binaries = executables.mksdcard.binaries.matching { it.name == "${platform}MksdcardExecutable" } - // 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("${platform}MksdcardExecutable").executableFile } |