Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TIMOB-16297] Fixed bug when you only have Android SDK 2.3.3 installed a... #5274

Merged
merged 1 commit into from
Feb 2, 2014
Merged

[TIMOB-16297] Fixed bug when you only have Android SDK 2.3.3 installed a... #5274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 8 additions & 3 deletions android/cli/commands/_build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,15 @@ AndroidBuilder.prototype.config = function config(logger, config, cli) {
// make sure we have an Android SDK and some Android targets
if (!Object.keys(androidInfo.targets).filter(function (id) {
var t = androidInfo.targets[id];
return t.type == 'platform' && t['api-level'] > _t.minSupportedApiLevel;
return t.type == 'platform' && t['api-level'] >= _t.minSupportedApiLevel;
}).length) {
logger.error(__('No Android SDK targets found.') + '\n');
logger.log(__('Please download SDK targets (api level %s or newer) via Android SDK Manager and try again.', _t.minSupportedApiLevel) + '\n');
if (Object.keys(androidInfo.targets).length) {
logger.error(__('No valid Android SDK targets found.'));
} else {
logger.error(__('No Android SDK targets found.'));
}
logger.error(__('Please download an Android SDK target API level %s or newer from the Android SDK Manager and try again.', _t.minSupportedApiLevel) + '\n');
process.exit(1);
}
}

Expand Down
3 changes: 2 additions & 1 deletion android/cli/locales/en.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"No valid Android SDK targets found.": "No valid Android SDK targets found.",
"No Android SDK targets found.": "No Android SDK targets found.",
"Please download SDK targets (api level %s or newer) via Android SDK Manager and try again.": "Please download SDK targets (api level %s or newer) via Android SDK Manager and try again.",
"Please download an Android SDK target API level %s or newer from the Android SDK Manager and try again.": "Please download an Android SDK target API level %s or newer from the Android SDK Manager and try again.",
"Unable to locate the Java Development Kit": "Unable to locate the Java Development Kit",
"You can specify the location by setting the %s environment variable.": "You can specify the location by setting the %s environment variable.",
"JDK version %s detected, but only version %s is supported": "JDK version %s detected, but only version %s is supported",
Expand Down