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

Merge branch 'master' into StudioProjectCompat

Browse Source 
This will have to be linted
This commit is contained in:
Joe Bowser
2017-06-26 10:29:31 -07:00
parent b20028c42b 55d7cf3865
commit e456175a81
42 changed files with 3130 additions and 3262 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/templates/cordova/lib/AndroidStudio.js
Vendored
+7 -7
View File
@@ -4,7 +4,7 @@
* @param {String} root Root folder of the project
*/
/*jshint esnext: false */
/* jshint esnext: false */
var path = require('path');
var fs = require('fs');
@@ -18,21 +18,21 @@ module.exports.isAndroidStudioProject = function isAndroidStudioProject(root) {
var isEclipse = false;
var isAS = true;
if(!fs.existsSync(root)) {
if (!fs.existsSync(root)) {
throw new CordovaError('AndroidStudio.js:inAndroidStudioProject root does not exist: ' + root);
}
// if any of the following exists, then we are not an ASProj
eclipseFiles.forEach(function(file) {
if(fs.existsSync(path.join(root, file))) {
eclipseFiles.forEach(function (file) {
if (fs.existsSync(path.join(root, file))) {
isEclipse = true;
}
});
// if it is NOT an eclipse project, check that all required files exist
if(!isEclipse) {
androidStudioFiles.forEach(function(file){
if(!fs.existsSync(path.join(root, file))) {
if (!isEclipse) {
androidStudioFiles.forEach(function (file) {
if (!fs.existsSync(path.join(root, file))) {
console.log('missing file :: ' + file);
isAS = false;
}