commit 28fb31855bd2210c0685581eec178959e1a24f38
author David 'Digit' Turner <digit@google.com> Wed Jun 18 17:26:50 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 18 17:01:55 2014 +0000
tree 5565c8e68ee6c6830781e5b0616d183889b74a75
parent 352df9ab2628e97e765adaa37396a1621cf0452e
parent b72ae03a20146da5fa15bb710e0d765bedf183c9

Merge "Fix: create missing partition images on demand."

build.gradle

diff --git a/build.gradle b/build.gradle
index 23d534c..c45de1d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,13 +13,16 @@
 
 sdk {
     common(mac, linux) {
-        item("$buildDefaultEmulator.output/lib") {
-            into 'lib'
+        item("$buildDefaultEmulator.output/emulator") {
+            executable true
             builtBy buildDefaultEmulator
         }
 
-        item("$buildDefaultEmulator.output/emulator") {
-            executable true
+/*
+XAV(2014-06-17)
+TEMPORARILY DISABLE BUILD TO USE PREBUILTS FOR DEFAULT 32bit(guest) EMU + GL LIBS
+        item("$buildDefaultEmulator.output/lib") {
+            into 'lib'
             builtBy buildDefaultEmulator
         }
 
@@ -49,38 +52,115 @@
             executable true
             builtBy buildDefaultEmulator
         }
+*/
     }
 
-    windows {
-        item("$buildWindowsEmulator.output/lib") {
+
+// --------------
+// XAV(2014-06-17) TEMPORARY EMULATOR FROM PREBUILTS
+    mac {
+        item("$project.rootDir/../prebuilts/tools/darwin-x86/emulator/lib") {
             into 'lib'
+        }
+
+        item("$project.rootDir/../prebuilts/tools/darwin-x86/emulator/emulator-arm") {
+            executable true
+        }
+        item("$project.rootDir/../prebuilts/tools/darwin-x86/emulator/emulator64-arm") {
+            executable true
+        }
+
+        item("$project.rootDir/../prebuilts/tools/darwin-x86/emulator/emulator-mips") {
+            executable true
+        }
+        item("$project.rootDir/../prebuilts/tools/darwin-x86/emulator/emulator64-mips") {
+            executable true
+        }
+
+        item("$project.rootDir/../prebuilts/tools/darwin-x86/emulator/emulator-x86") {
+            executable true
+        }
+        item("$project.rootDir/../prebuilts/tools/darwin-x86/emulator/emulator64-x86") {
+            executable true
+        }
+    }
+    linux {
+        item("$project.rootDir/../prebuilts/tools/linux-x86/emulator/lib") {
+            into 'lib'
+        }
+
+        item("$project.rootDir/../prebuilts/tools/linux-x86/emulator/emulator-arm") {
+            executable true
+        }
+        item("$project.rootDir/../prebuilts/tools/linux-x86/emulator/emulator64-arm") {
+            executable true
+        }
+
+        item("$project.rootDir/../prebuilts/tools/linux-x86/emulator/emulator-mips") {
+            executable true
+        }
+        item("$project.rootDir/../prebuilts/tools/linux-x86/emulator/emulator64-mips") {
+            executable true
+        }
+
+        item("$project.rootDir/../prebuilts/tools/linux-x86/emulator/emulator-x86") {
+            executable true
+        }
+        item("$project.rootDir/../prebuilts/tools/linux-x86/emulator/emulator64-x86") {
+            executable true
+        }
+    }
+// --------------
+
+    windows {
+        item("$buildWindowsEmulator.output/emulator.exe") {
             builtBy buildWindowsEmulator
         }
 
-        item("$buildWindowsEmulator.output/emulator.exe") {
+/*
+XAV(2014-06-17)
+TEMPORARILY DISABLE BUILD TO USE PREBUILTS FOR DEFAULT 32bit(guest) EMU + GL LIBS
+        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(2014-06-17) TEMPORARY EMULATOR FROM PREBUILTS
+        item("$project.rootDir/../prebuilts/tools/windows/emulator/lib") {
+            into 'lib'
+        }
+
+        item("$project.rootDir/../prebuilts/tools/windows/emulator/emulator-arm.exe")
+        item("$project.rootDir/../prebuilts/tools/windows/emulator/emulator-mips.exe")
+        item("$project.rootDir/../prebuilts/tools/windows/emulator/emulator-x86.exe")
+// --------------
+
+/*
+XAV(2014-06-17): 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
+        }
+*/
     }
 }