Repository: cordova-android Updated Branches: refs/heads/master 9af7f506f -> 40a740b45
CB-11015 Error adding plugin with gradle extras Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/40a740b4 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/40a740b4 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/40a740b4 Branch: refs/heads/master Commit: 40a740b45c2b3721f7d474e48c6aa23a15f7e42f Parents: 9af7f50 Author: daserge <[email protected]> Authored: Fri Apr 15 16:13:00 2016 +0300 Committer: daserge <[email protected]> Committed: Mon Apr 18 13:20:25 2016 +0300 ---------------------------------------------------------------------- bin/templates/cordova/lib/pluginHandlers.js | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/40a740b4/bin/templates/cordova/lib/pluginHandlers.js ---------------------------------------------------------------------- diff --git a/bin/templates/cordova/lib/pluginHandlers.js b/bin/templates/cordova/lib/pluginHandlers.js index f77adf1..6a315e9 100644 --- a/bin/templates/cordova/lib/pluginHandlers.js +++ b/bin/templates/cordova/lib/pluginHandlers.js @@ -69,24 +69,22 @@ var handlers = { var parentDir = obj.parent ? path.resolve(project.projectDir, obj.parent) : project.projectDir; var subDir; - if (obj.custom) { - var subRelativeDir = project.getCustomSubprojectRelativeDir(plugin.id, src); - copyNewFile(plugin.dir, src, project.projectDir, subRelativeDir, !!(options && options.link)); - subDir = path.resolve(project.projectDir, subRelativeDir); - } else { - obj.type = 'sys'; - subDir = src; + if (obj.custom) { + var subRelativeDir = project.getCustomSubprojectRelativeDir(plugin.id, src); + copyNewFile(plugin.dir, src, project.projectDir, subRelativeDir, !!(options && options.link)); + subDir = path.resolve(project.projectDir, subRelativeDir); + } else { + obj.type = 'sys'; + subDir = src; } if (obj.type == 'gradleReference') { project.addGradleReference(parentDir, subDir); - } else if (obj.type == 'sys') { - project.addSystemLibrary(parentDir, subDir); - } else { - project.addSubProject(parentDir, subDir); + } else if (obj.type == 'sys') { + project.addSystemLibrary(parentDir, subDir); + } else { + project.addSubProject(parentDir, subDir); } - - project.addSubProject(parentDir, subDir); }, uninstall:function(obj, plugin, project, options) { var src = obj.src; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
