aboutsummaryrefslogtreecommitdiffstats
path: root/emulator
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@google.com>2015-02-12 13:14:37 -0800
committerXavier Ducrohet <xav@google.com>2015-02-12 13:14:37 -0800
commit4cab9f439720ff9fd914f8bfcbf6b72b04a50d6b (patch)
tree6015ffd3940dedacfbaa33ad0a0165358bf35785 /emulator
parentf7757fbc3e2361e3f3dfad355ed5f82397fb55d5 (diff)
downloadsdk-4cab9f439720ff9fd914f8bfcbf6b72b04a50d6b.zip
sdk-4cab9f439720ff9fd914f8bfcbf6b72b04a50d6b.tar.gz
sdk-4cab9f439720ff9fd914f8bfcbf6b72b04a50d6b.tar.bz2
Revert "Add targetPlatform for executable binaries"
This reverts commit 7f3cb91779907c12d02e8e5c5f4a6a7c510d210e.
Diffstat (limited to 'emulator')
-rw-r--r--emulator/mksdcard/build.gradle28
1 files changed, 14 insertions, 14 deletions
diff --git a/emulator/mksdcard/build.gradle b/emulator/mksdcard/build.gradle
index bd029b2..677f763 100644
--- a/emulator/mksdcard/build.gradle
+++ b/emulator/mksdcard/build.gradle
@@ -2,20 +2,17 @@ apply plugin: 'c'
apply plugin: 'sdk-files'
apply plugin: 'native-setup'
-model {
- components {
- mksdcard(NativeExecutableSpec) {
- sources {
- c {
- source {
- srcDir "src/source"
- include "**/*.c"
- }
- }
+executables {
+ mksdcard {}
+}
+
+sources {
+ mksdcard {
+ c {
+ source {
+ srcDir "src/source"
+ include "**/*.c"
}
- targetPlatform "darwin"
- targetPlatform "linux"
- targetPlatform "windows32"
}
}
}
@@ -46,6 +43,9 @@ sdk {
}
def getExeName(String platform) {
- return binaries.getByName("${platform}MksdcardExecutable").executableFile
+ // 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)
}