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

Check that 32 bit libraries are installed by trying to run aapt

Browse Source
This commit is contained in:
Justin SB
2014-10-24 13:19:36 -07:00
committed by Emily Stark
parent 7fc2d3465e
commit 7c83462242
1 changed files with 51 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
tools/commands-cordova.js
View File

@@ -2121,6 +2121,43 @@ _.extend(Android.prototype, {
return true;
},
canRunAapt: function (buildToolsVersion) {
var self = this;
var androidSdkPath = self.findAndroidSdk();
var aaptPath = path.join(androidSdkPath,
'build-tools',
buildToolsVersion,
'aapt');
var args = [ 'version' ];
try {
var options = {};
options.env = buildAndroidEnv();
// We'll check the exit code ourselves
options.checkExitCode = false;
var cmd = new processes.RunCommand(aaptPath, args, options);
var execution = cmd.run();
if (execution.exitCode !== 0) {
Console.debug("Unable to run aapt." +
" (This is normal if 32 bit libraries are not found)");
Console.debug(" exit code: " + execution.exitCode);
Console.debug(" stdout: " + execution.stdout);
Console.debug(" stderr: " + execution.stderr);
return false;
}
// version is in stdout
return true;
} catch (err) {
Console.debug("Error while running aapt", err);
return false;
}
},
isPlatformToolsInstalled: function () {
var self = this;
@@ -2591,8 +2628,10 @@ _.extend(Android.prototype, {
}
}
var hasBuildToolsVersion;
if (self.isBuildToolsInstalled('21.0.0')) {
log && Console.info(Console.success("Found Android Build Tools"));
hasBuildToolsVersion = '21.0.0';
} else {
if (fixSilent) {
log && Console.info("Installing Android Build Tools");
@@ -2600,6 +2639,7 @@ _.extend(Android.prototype, {
return self.isBuildToolsInstalled('21.0.0');
});
log && Console.info(Console.success("Installed Android Build Tools"));
hasBuildToolsVersion = '21.0.0';
} else {
log && Console.info(Console.fail("Android Build Tools not found"));
@@ -2608,6 +2648,17 @@ _.extend(Android.prototype, {
}
}
if (hasBuildToolsVersion) {
// Check that we can actually run aapt - on 64 bit, we need 32 bit libs
// We need aapt to be installed to do this!
if (!self.canRunAapt(hasBuildToolsVersion)) {
log && Console.info(Console.fail("32-bit libraries not found"));
result.missing.push("libs32");
result.acceptable = false;
}
}
if (self.isPlatformInstalled('android-19')) {
log && Console.info(Console.success("Found Android 19 API"));
} else {