aboutsummaryrefslogtreecommitdiffstats
path: root/find_java
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 /find_java
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 'find_java')
-rw-r--r--find_java/build.gradle27
1 files changed, 14 insertions, 13 deletions
diff --git a/find_java/build.gradle b/find_java/build.gradle
index 8c1ed43..b359e0a 100644
--- a/find_java/build.gradle
+++ b/find_java/build.gradle
@@ -2,19 +2,17 @@ apply plugin: 'cpp'
apply plugin: 'sdk-files'
apply plugin: 'windows-setup'
-model {
- components {
- findJava(NativeExecutableSpec) {
- sources {
- cpp {
- source {
- srcDir "src/source"
- include "**/*.cpp"
- }
- }
+executables {
+ findJava {}
+}
+
+sources {
+ findJava {
+ cpp {
+ source {
+ srcDir "src/source"
+ include "**/*.cpp"
}
- targetPlatform "windows32"
- targetPlatform "windows64"
}
}
}
@@ -41,6 +39,9 @@ sdk {
}
def getExeName(String name) {
- return binaries.getByName(name).executableFile
+ // binaries will return a set of binaries
+ 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)
}