undoing android_parser changes
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/6a6821ff Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/6a6821ff Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/6a6821ff Branch: refs/heads/master Commit: 6a6821ff645490aac5f616fdf468a528ac92464d Parents: 99931eb Author: Anis Kadri <a...@apache.org> Authored: Wed Sep 14 17:04:23 2016 -0700 Committer: Anis Kadri <a...@apache.org> Committed: Wed Sep 14 17:04:23 2016 -0700 ---------------------------------------------------------------------- cordova-lib/src/cordova/metadata/android_parser.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6a6821ff/cordova-lib/src/cordova/metadata/android_parser.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/metadata/android_parser.js b/cordova-lib/src/cordova/metadata/android_parser.js index 3fdd4d1..2b3b211 100644 --- a/cordova-lib/src/cordova/metadata/android_parser.js +++ b/cordova-lib/src/cordova/metadata/android_parser.js @@ -31,7 +31,7 @@ var fs = require('fs'), function android_parser(project) { - if (!fs.existsSync(path.join(project, 'build.gradle'))) { + if (!fs.existsSync(path.join(project, 'AndroidManifest.xml'))) { throw new CordovaError('The provided path "' + project + '" is not an Android project.'); } @@ -39,12 +39,6 @@ function android_parser(project) { Parser.call(this, 'android', project); this.path = project; - - //If we have a gradle file but not a manifest, this is an Android Studio project - if(!fs.existsSync(path.join(project, 'AndroidManifest.xml'))) { - this.path = path.join(project, 'app', 'src', 'main'); - } - this.strings = path.join(this.path, 'res', 'values', 'strings.xml'); this.manifest = path.join(this.path, 'AndroidManifest.xml'); this.android_config = path.join(this.path, 'res', 'xml', 'config.xml'); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
