Merge "Add targetPlatform for executable binaries" into gradle-devgradle-dev

4 files changed, 15 insertions, 20 deletions

diff --git a/avdlauncher/build.gradle b/avdlauncher/build.gradle
index 2c9ffd53e..b0e2c9008 100644
--- a/avdlauncher/build.gradle
+++ b/avdlauncher/build.gradle
@@ -13,24 +13,22 @@ model {
                     }
                 }
             }
+            targetPlatform "windows32"
         }
     }
 }
 
 sdk {
     windows {
-        item( { getExeName("windows32AvdLauncherExecutable") } ) {
+        item( { getExeName("avdLauncherExecutable") } ) {
             into 'lib'
             name 'AVD Manager.exe'
-            builtBy 'windows32AvdLauncherExecutable'
+            builtBy 'avdLauncherExecutable'
         }
     }
 }
 
 def getExeName(String name) {
-    // binaries will return a set of binaries
-    def binaries = components.avdLauncher.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
 }
 
diff --git a/emulator/mksdcard/build.gradle b/emulator/mksdcard/build.gradle
index a07d90a62..bd029b212 100644
--- a/emulator/mksdcard/build.gradle
+++ b/emulator/mksdcard/build.gradle
@@ -13,6 +13,9 @@ model {
                     }
                 }
             }
+            targetPlatform "darwin"
+            targetPlatform "linux"
+            targetPlatform "windows32"
         }
     }
 }
@@ -43,9 +46,6 @@ sdk {
 }
 
 def getExeName(String platform) {
-    // binaries will return a set of binaries
-    def binaries = components.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
 }
 
diff --git a/find_java/build.gradle b/find_java/build.gradle
index bcdf41ee1..8c1ed439f 100644
--- a/find_java/build.gradle
+++ b/find_java/build.gradle
@@ -13,6 +13,8 @@ model {
                     }
                 }
             }
+            targetPlatform "windows32"
+            targetPlatform "windows64"
         }
     }
 }
@@ -39,9 +41,6 @@ sdk {
 }
 
 def getExeName(String name) {
-    // binaries will return a set of binaries
-    def binaries = components.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)
+    return binaries.getByName(name).executableFile
 }
 
diff --git a/sdklauncher/build.gradle b/sdklauncher/build.gradle
index 553271121..b04ee0523 100644
--- a/sdklauncher/build.gradle
+++ b/sdklauncher/build.gradle
@@ -13,24 +13,22 @@ model {
                     }
                 }
             }
+            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 = components.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
 }