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

4 files changed, 55 insertions, 60 deletions

diff --git a/avdlauncher/build.gradle b/avdlauncher/build.gradle
index c280642..b0e2c90 100644
--- a/avdlauncher/build.gradle
+++ b/avdlauncher/build.gradle
@@ -2,35 +2,33 @@ apply plugin: 'c'
 apply plugin: 'sdk-files'
 apply plugin: 'windows-setup'
 
-executables {
-    avdLauncher {}
-}
-
-sources {
-    avdLauncher {
-        c {
-            source {
-                srcDir "src/source"
-                include "**/*.c"
+model {
+    components {
+        avdLauncher(NativeExecutableSpec) {
+            sources {
+                c {
+                    source {
+                        srcDir "src/source"
+                        include "**/*.c"
+                    }
+                }
             }
+            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 = 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)
+    return binaries.getByName(name).executableFile
 }
 
diff --git a/emulator/mksdcard/build.gradle b/emulator/mksdcard/build.gradle
index 677f763..bd029b2 100644
--- a/emulator/mksdcard/build.gradle
+++ b/emulator/mksdcard/build.gradle
@@ -2,17 +2,20 @@ apply plugin: 'c'
 apply plugin: 'sdk-files'
 apply plugin: 'native-setup'
 
-executables {
-    mksdcard {}
-}
-
-sources {
-    mksdcard {
-        c {
-            source {
-                srcDir "src/source"
-                include "**/*.c"
+model {
+    components {
+        mksdcard(NativeExecutableSpec) {
+            sources {
+                c {
+                    source {
+                        srcDir "src/source"
+                        include "**/*.c"
+                    }
+                }
             }
+            targetPlatform "darwin"
+            targetPlatform "linux"
+            targetPlatform "windows32"
         }
     }
 }
@@ -43,9 +46,6 @@ sdk {
 }
 
 def getExeName(String platform) {
-    // 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)
+    return binaries.getByName("${platform}MksdcardExecutable").executableFile
 }
 
diff --git a/find_java/build.gradle b/find_java/build.gradle
index b359e0a..8c1ed43 100644
--- a/find_java/build.gradle
+++ b/find_java/build.gradle
@@ -2,17 +2,19 @@ apply plugin: 'cpp'
 apply plugin: 'sdk-files'
 apply plugin: 'windows-setup'
 
-executables {
-    findJava {}
-}
-
-sources {
-    findJava {
-        cpp {
-            source {
-                srcDir "src/source"
-                include "**/*.cpp"
+model {
+    components {
+        findJava(NativeExecutableSpec) {
+            sources {
+                cpp {
+                    source {
+                        srcDir "src/source"
+                        include "**/*.cpp"
+                    }
+                }
             }
+            targetPlatform "windows32"
+            targetPlatform "windows64"
         }
     }
 }
@@ -39,9 +41,6 @@ sdk {
 }
 
 def getExeName(String name) {
-    // 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)
+    return binaries.getByName(name).executableFile
 }
 
diff --git a/sdklauncher/build.gradle b/sdklauncher/build.gradle
index 6c64f6d..b04ee05 100644
--- a/sdklauncher/build.gradle
+++ b/sdklauncher/build.gradle
@@ -2,35 +2,33 @@ apply plugin: 'c'
 apply plugin: 'sdk-files'
 apply plugin: 'windows-setup'
 
-executables {
-    sdkLauncher {}
-}
-
-sources {
-    sdkLauncher {
-        c {
-            source {
-                srcDir "src/source"
-                include "**/*.c"
+model {
+    components {
+        sdkLauncher(NativeExecutableSpec) {
+            sources {
+                c {
+                    source {
+                        srcDir "src/source"
+                        include "**/*.c"
+                    }
+                }
             }
+            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 = 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)
+    return binaries.getByName(name).executableFile
 }