github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-01-31 17:32:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Quick fix to support ANDROID_SDK_ROOT (#656)

Browse Source 
resolves #617
This commit is contained in:
Chris Brody 2019-02-12 09:20:17 -05:00 committed by GitHub
parent e99c145d55
commit b4de6f55c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bin/templates/cordova/lib/check_reqs.js vendored
View File

@ -231,6 +231,14 @@ module.exports.check_android = function () {
// First ensure ANDROID_HOME is set // First ensure ANDROID_HOME is set
// If we have no hints (nothing in PATH), try a few default locations // If we have no hints (nothing in PATH), try a few default locations
if (!hasAndroidHome && !androidCmdPath && !adbInPath && !avdmanagerInPath) { if (!hasAndroidHome && !androidCmdPath && !adbInPath && !avdmanagerInPath) {
if (process.env['ANDROID_SDK_ROOT']) {
// Quick fix to set ANDROID_HOME according to ANDROID_SDK_ROOT
// if ANDROID_HOME is **not** defined and
// ANDROID_SDK_ROOT **is** defined
// according to environment variables as documented in:
// https://developer.android.com/studio/command-line/variables
maybeSetAndroidHome(path.join(process.env['ANDROID_SDK_ROOT']));
}
if (module.exports.isWindows()) { if (module.exports.isWindows()) {
// Android Studio 1.0 installer // Android Studio 1.0 installer
maybeSetAndroidHome(path.join(process.env['LOCALAPPDATA'], 'Android', 'sdk')); maybeSetAndroidHome(path.join(process.env['LOCALAPPDATA'], 'Android', 'sdk'));
@ -356,12 +364,13 @@ module.exports.check_android_target = function (originalError) {
module.exports.run = function () { module.exports.run = function () {
return Q.all([this.check_java(), this.check_android()]).then(function (values) { return Q.all([this.check_java(), this.check_android()]).then(function (values) {
console.log('Checking Java JDK and Android SDK versions'); console.log('Checking Java JDK and Android SDK versions');
console.log('ANDROID_HOME=' + process.env['ANDROID_HOME']); console.log('ANDROID_SDK_ROOT=' + process.env['ANDROID_SDK_ROOT'] + ' (recommended setting)');
console.log('ANDROID_HOME=' + process.env['ANDROID_HOME'] + ' (DEPRECATED)');
if (!String(values[0]).startsWith('1.8.')) { if (!String(values[0]).startsWith('1.8.')) {
throw new CordovaError( throw new CordovaError(
'Requirements check failed for JDK 8 (\'1.8.*\')! Detected version: ' + values[0] + '\n' + 'Requirements check failed for JDK 8 (\'1.8.*\')! Detected version: ' + values[0] + '\n' +
'Check your JAVA_HOME / ANDROID_HOME / PATH environment variables.' 'Check your ANDROID_SDK_ROOT / JAVA_HOME / PATH environment variables.'
); );
} }