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

CB-11083 Fix to deal with custom frameworks with their own Gradle configuration

Browse Source
This commit is contained in:
Joe Bowser 2016-06-07 16:06:40 -07:00
parent 0b710a86a9
commit 2f3c71feaa
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bin/templates/cordova/lib/builders/GradleBuilder.js vendored
View File

@ -73,10 +73,16 @@ GradleBuilder.prototype.prepBuildFiles = function() {
var subProjects = propertiesObj.libs; var subProjects = propertiesObj.libs;
for (var i = 0; i < subProjects.length; ++i) { for (var i = 0; i < subProjects.length; ++i) {
if (subProjects[i] !== 'CordovaLib') { if (subProjects[i] !== 'CordovaLib') {
shell.cp('-f', pluginBuildGradle, path.join(this.root, subProjects[i], 'build.gradle')); var subProjectGradle = path.join(this.root, subProjects[i], 'build.gradle');
// Only copy the gradle if it doesn't exist for the library
fs.exists(subProjectGradle, function(exists) {
if (!exists)
{
shell.cp('-f', pluginBuildGradle, path.join(this.root, subProjects[i], 'build.gradle'));
}
});
} }
} }
var name = this.extractRealProjectNameFromManifest(); var name = this.extractRealProjectNameFromManifest();
//Remove the proj.id/name- prefix from projects: https://issues.apache.org/jira/browse/CB-9149 //Remove the proj.id/name- prefix from projects: https://issues.apache.org/jira/browse/CB-9149
var settingsGradlePaths = subProjects.map(function(p){ var settingsGradlePaths = subProjects.map(function(p){