github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move hasAcceleration to last check; it is the least important

Browse Source 
We don't want it to be the first thing we link to on the wiki.

It's also nice if it comes last in the checklist, as it's the most likely thing
for users not to have.
This commit is contained in:
Justin SB
2014-10-24 13:28:22 -07:00
parent 768812cf02
commit 1ec5d85fd1
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
tools/commands-cordova.js
View File

@@ -2591,26 +2591,6 @@ _.extend(Android.prototype, {
}
}
// (hasAcceleration can also be undefined)
var hasAcceleration = self.hasAcceleration();
if (hasAcceleration === false) {
if (fix) {
self.installAcceleration();
} else {
log && Console.info(Console.fail("Android emulator acceleration is not installed"));
log && Console.info(" (The Android emulator will be very slow without acceleration)");
result.missing.push("haxm");
// Not all systems can install the accelerator, so don't block
// XXX: Maybe we should block the emulator (only); it is unusable without it
//result.acceptable = false
}
} else if (hasAcceleration === true) {
// (can be undefined)
log && Console.info(Console.success("Android emulator acceleration is installed"));
}
if (hasAndroid && hasJava) {
if (self.isPlatformToolsInstalled()) {
log && Console.info(Console.success("Found Android Platform tools"));
@@ -2728,6 +2708,26 @@ _.extend(Android.prototype, {
}
}
// (hasAcceleration can also be undefined)
var hasAcceleration = self.hasAcceleration();
if (hasAcceleration === false) {
if (fix) {
self.installAcceleration();
} else {
log && Console.info(Console.fail("Android emulator acceleration is not installed"));
log && Console.info(" (The Android emulator will be very slow without acceleration)");
result.missing.push("haxm");
// Not all systems can install the accelerator, so don't block
// XXX: Maybe we should block the emulator (only); it is unusable without it
//result.acceptable = false
}
} else if (hasAcceleration === true) {
// (can be undefined)
log && Console.info(Console.success("Android emulator acceleration is installed"));
}
return result;
}
});