You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2014/12/31 06:18:35 UTC
cordova-lib git commit: CB-8230 Make project.properties optional for
Android sub-libraries
Repository: cordova-lib
Updated Branches:
refs/heads/master 68ac4cdbf -> 403c3aa31
CB-8230 Make project.properties optional for Android sub-libraries
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/403c3aa3
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/403c3aa3
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/403c3aa3
Branch: refs/heads/master
Commit: 403c3aa31db77e19fb59492c89e13d4d6b2a391a
Parents: 68ac4cd
Author: Andrew Grieve <ag...@chromium.org>
Authored: Wed Dec 31 00:18:05 2014 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Wed Dec 31 00:18:05 2014 -0500
----------------------------------------------------------------------
cordova-lib/src/plugman/util/android-project.js | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/403c3aa3/cordova-lib/src/plugman/util/android-project.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/util/android-project.js b/cordova-lib/src/plugman/util/android-project.js
index 8d2b932..c38c8b9 100644
--- a/cordova-lib/src/plugman/util/android-project.js
+++ b/cordova-lib/src/plugman/util/android-project.js
@@ -126,17 +126,16 @@ function AndroidProject() {
AndroidProject.prototype = {
addSubProject: function(parentDir, subDir) {
- var subProjectFile = path.resolve(subDir, 'project.properties');
- if (!fs.existsSync(subProjectFile)) throw new Error('cannot find "' + subProjectFile + '" referenced in <framework>');
-
var parentProjectFile = path.resolve(parentDir, 'project.properties');
+ var subProjectFile = path.resolve(subDir, 'project.properties');
var parentProperties = this._getPropertiesFile(parentProjectFile);
+ if (fs.existsSync(subProjectFile)) {
+ var subProperties = this._getPropertiesFile(subProjectFile);
+ subProperties.set('target', parentProperties.get('target'));
+ this._subProjectDirs[subDir] = true;
+ }
addLibraryReference(parentProperties, module.exports.getRelativeLibraryPath(parentDir, subDir));
- var subProperties = this._getPropertiesFile(subProjectFile);
- subProperties.set('target', parentProperties.get('target'));
-
- this._subProjectDirs[subDir] = true;
this._dirty = true;
},
removeSubProject: function(parentDir, subDir) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org