commit f995446bd3914443493a7a8aa0c315c49c8960c0
author Xavier Ducrohet <xav@google.com> Wed Jun 18 05:14:21 2014 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 18 05:14:21 2014 +0000
tree a3147a367cf2abc2f380f2f97f49bba687b289c9
parent db7b9f70d3b01c037bf20fc619137c414f20e0fb
parent b58beab69807171beeb040942af539c89e5558e8

Merge "Misc ordering of build rules." into idea133
automerge: b58beab

* commit 'b58beab69807171beeb040942af539c89e5558e8':
  Misc ordering of build rules.

build.gradle

diff --git a/build.gradle b/build.gradle
index 23d534c..3b9810a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,13 +13,13 @@
 
 sdk {
     common(mac, linux) {
-        item("$buildDefaultEmulator.output/lib") {
-            into 'lib'
+        item("$buildDefaultEmulator.output/emulator") {
+            executable true
             builtBy buildDefaultEmulator
         }
 
-        item("$buildDefaultEmulator.output/emulator") {
-            executable true
+        item("$buildDefaultEmulator.output/lib") {
+            into 'lib'
             builtBy buildDefaultEmulator
         }
 
@@ -52,35 +52,40 @@
     }
 
     windows {
-        item("$buildWindowsEmulator.output/lib") {
-            into 'lib'
+        item("$buildWindowsEmulator.output/emulator.exe") {
             builtBy buildWindowsEmulator
         }
 
-        item("$buildWindowsEmulator.output/emulator.exe") {
+        item("$buildWindowsEmulator.output/lib") {
+            into 'lib'
             builtBy buildWindowsEmulator
         }
 
         item("$buildWindowsEmulator.output/emulator-arm.exe") {
             builtBy buildWindowsEmulator
         }
-/*        item("$buildWindowsEmulator.output/emulator64-arm.exe") {
-            builtBy buildWindowsEmulator
-        }*/
-
         item("$buildWindowsEmulator.output/emulator-mips.exe") {
             builtBy buildWindowsEmulator
         }
-/*        item("$buildWindowsEmulator.output/emulator64-mips.exe") {
-            builtBy buildWindowsEmulator
-        }*/
-
         item("$buildWindowsEmulator.output/emulator-x86.exe") {
             builtBy buildWindowsEmulator
         }
-/*        item("$buildWindowsEmulator.output/emulator64-x86.exe") {
+
+
+/*
+XAV: DISABLE win64 exe until it's ready
+        item("$buildWindowsEmulator.output/emulator64-arm.exe") {
             builtBy buildWindowsEmulator
-        }*/
+        }
+
+        item("$buildWindowsEmulator.output/emulator64-mips.exe") {
+            builtBy buildWindowsEmulator
+        }
+
+        item("$buildWindowsEmulator.output/emulator64-x86.exe") {
+            builtBy buildWindowsEmulator
+        }
+*/
     }
 }