Skip to content
Permalink
Browse files
  • Loading branch information
stevengill committed Apr 11, 2014
2 parents 8551e96 + 28e4052 commit 28318d8eaaa5700ae500fdd9bcca72ffbd175a50
Showing 1 changed file with 9 additions and 2 deletions.
@@ -274,8 +274,8 @@ function reapply_global_munge () {
);
continue;
}
// TODO: This is mostly file IO and can run in parallel since each file is independent.
self.apply_file_munge(file, global_munge.files[file]);

self.apply_file_munge(file, global_munge.files[file]);
}
}

@@ -386,7 +386,14 @@ function ConfigKeeper() {
ConfigKeeper.prototype.get = ConfigKeeper_get;
function ConfigKeeper_get(project_dir, platform, file) {
var self = this;

//This fixes a bug with older plugins - when specifying config xml instead of res/xml/config.xml
//https://issues.apache.org/jira/browse/CB-6414
if(file == 'config.xml' && platform == 'android'){
file = 'res/xml/config.xml';
}
var fake_path = path.join(project_dir, platform, file);

if (self._cached[fake_path]) {
return self._cached[fake_path];
}

0 comments on commit 28318d8

Please sign in to comment.