Merge "Revert "Add targetPlatform for executable binaries"" into studio-1.2-dev

automerge: 2c05810

* commit '2c0581045e20439c54ff5aec76681e4429389f8b':
  Revert "Add targetPlatform for executable binaries"

4 files changed, 60 insertions, 55 deletions

diff --git a/avdlauncher/build.gradle b/avdlauncher/build.gradle
index b0e2c90..c280642 100644
--- a/avdlauncher/build.gradle
+++ b/avdlauncher/build.gradle
@@ -2,33 +2,35 @@ apply plugin: 'c'
 apply plugin: 'sdk-files'
 apply plugin: 'windows-setup'
 
-model {
-    components {
-        avdLauncher(NativeExecutableSpec) {
-            sources {
-                c {
-                    source {
-                        srcDir "src/source"
-                        include "**/*.c"
-                    }
-                }
+executables {
+    avdLauncher {}
+}
+
+sources {
+    avdLauncher {
+        c {
+            source {
+                srcDir "src/source"
+                include "**/*.c"
             }
-            targetPlatform "windows32"
         }
     }
 }
 
 sdk {
     windows {
-        item( { getExeName("avdLauncherExecutable") } ) {
+        item( { getExeName("windows32AvdLauncherExecutable") } ) {
             into 'lib'
             name 'AVD Manager.exe'
-            builtBy 'avdLauncherExecutable'
+            builtBy 'windows32AvdLauncherExecutable'
         }
     }
 }
 
 def getExeName(String name) {
-    return binaries.getByName(name).executableFile
+    // binaries will return a set of binaries
+    def binaries = executables.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)
 }
 
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)
 }
 
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)
 }
 
diff --git a/sdklauncher/build.gradle b/sdklauncher/build.gradle
index b04ee05..6c64f6d 100644
--- a/sdklauncher/build.gradle
+++ b/sdklauncher/build.gradle
@@ -2,33 +2,35 @@ apply plugin: 'c'
 apply plugin: 'sdk-files'
 apply plugin: 'windows-setup'
 
-model {
-    components {
-        sdkLauncher(NativeExecutableSpec) {
-            sources {
-                c {
-                    source {
-                        srcDir "src/source"
-                        include "**/*.c"
-                    }
-                }
+executables {
+    sdkLauncher {}
+}
+
+sources {
+    sdkLauncher {
+        c {
+            source {
+                srcDir "src/source"
+                include "**/*.c"
             }
-            targetPlatform "windows32"
         }
     }
 }
 
 sdk {
     windows {
-        item( { getExeName("sdkLauncherExecutable") } ) {
+        item( { getExeName("windows32SdkLauncherExecutable") } ) {
             into 'lib'
             name 'SDK Manager.exe'
-            builtBy 'sdkLauncherExecutable'
+            builtBy 'windows32SdkLauncherExecutable'
         }
     }
 }
 
 def getExeName(String name) {
-    return binaries.getByName(name).executableFile
+    // binaries will return a set of binaries
+    def binaries = executables.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)
 }