github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2026-05-30 00:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 4.0.x (Gradle library dependencies)

Browse Source
This commit is contained in:
Ian Clelland
2014-08-20 11:43:58 -04:00
parent 4c1942e3fe b6c5a5fc9a
commit b2776269cf
5 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/lib/android_sdk_version.js
+1 -1
View File
@@ -51,7 +51,7 @@ get_sdks = function() {
return Q();
}, function(stderr) {
if (stderr.match(/command\snot\sfound/)) {
if (stderr.match(/command\snot\sfound/) || stderr.match(/'android' is not recognized/)) {
return Q.reject(new Error('The command \"android\" failed. Make sure you have the latest Android SDK installed, and the \"android\" command (inside the tools/ folder) is added to your path.'));
} else {
return Q.reject(new Error('An error occurred while listing Android targets'));
bin/lib/create.js
-1
View File
@@ -122,7 +122,6 @@ function copyBuildRules(projectPath) {
shell.cp('-f', path.join(srcDir, 'custom_rules.xml'), projectPath);
shell.cp('-f', path.join(srcDir, 'build.gradle'), projectPath);
shell.cp('-f', path.join(srcDir, 'libraries.gradle'), projectPath);
shell.cp('-f', path.join(srcDir, 'settings.gradle'), projectPath);
}