aboutsummaryrefslogtreecommitdiffstats
path: root/find_java
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@google.com>2014-11-07 10:55:10 -0800
committerXavier Ducrohet <xav@google.com>2014-11-07 11:17:00 -0800
commit8e66edff331244d3a1ad3847e774f98cd342485d (patch)
tree14e291457afc7f06a2c03179a9310ac1a62903a2 /find_java
parent2fb44fb0f599dfc53907f63ffaed8bd78638df35 (diff)
downloadplatform_sdk-8e66edff331244d3a1ad3847e774f98cd342485d.tar.gz
platform_sdk-8e66edff331244d3a1ad3847e774f98cd342485d.tar.bz2
platform_sdk-8e66edff331244d3a1ad3847e774f98cd342485d.zip
Build and package 32/64bit find_java.
Change-Id: I93a2e42fb0a81d1495bb12b657b6bd6a597a128e
Diffstat (limited to 'find_java')
-rw-r--r--find_java/build.gradle16
1 files changed, 11 insertions, 5 deletions
diff --git a/find_java/build.gradle b/find_java/build.gradle
index b1dfa793d..b359e0a17 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)
}