public/cordova-android
public/cordova-android
9
0
Fork 0
forked from github/cordova-android
Code Pull Requests Activity

CB-11015 Error adding plugin with gradle extras

Browse Source
This commit is contained in:
daserge 2016-04-15 16:13:00 +03:00
parent 9af7f506f0
commit 40a740b45c
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
bin/templates/cordova/lib/pluginHandlers.js vendored
View File

@ -69,24 +69,22 @@ var handlers = {
var parentDir = obj.parent ? path.resolve(project.projectDir, obj.parent) : project.projectDir; var parentDir = obj.parent ? path.resolve(project.projectDir, obj.parent) : project.projectDir;
var subDir; var subDir;
if (obj.custom) { if (obj.custom) {
var subRelativeDir = project.getCustomSubprojectRelativeDir(plugin.id, src); var subRelativeDir = project.getCustomSubprojectRelativeDir(plugin.id, src);
copyNewFile(plugin.dir, src, project.projectDir, subRelativeDir, !!(options && options.link)); copyNewFile(plugin.dir, src, project.projectDir, subRelativeDir, !!(options && options.link));
subDir = path.resolve(project.projectDir, subRelativeDir); subDir = path.resolve(project.projectDir, subRelativeDir);
} else { } else {
obj.type = 'sys'; obj.type = 'sys';
subDir = src; subDir = src;
} }
if (obj.type == 'gradleReference') { if (obj.type == 'gradleReference') {
project.addGradleReference(parentDir, subDir); project.addGradleReference(parentDir, subDir);
} else if (obj.type == 'sys') { } else if (obj.type == 'sys') {
project.addSystemLibrary(parentDir, subDir); project.addSystemLibrary(parentDir, subDir);
} else { } else {
project.addSubProject(parentDir, subDir); project.addSubProject(parentDir, subDir);
} }
project.addSubProject(parentDir, subDir);
}, },
uninstall:function(obj, plugin, project, options) { uninstall:function(obj, plugin, project, options) {
var src = obj.src; var src = obj.src;