Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[6_1_X][TIMOB-24834] Merge value resources into single file #9163

Merged
merged 1 commit into from
Jun 20, 2017
Merged

[6_1_X][TIMOB-24834] Merge value resources into single file #9163

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions android/cli/lib/base-builder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,16 @@ AndroidBaseBuilder.prototype.writeXmlFile = function writeXmlFile(srcOrDoc, dest
}
fs.writeFileSync(dest, '<?xml version="1.0" encoding="UTF-8"?>\n' + srcDoc.toString());
return;
} else {
// Resource sets under a qualifier all need to be merged into a single values
// file so we adjust the destination path here if necessary
var valueResourcesPattern = /res\/(values(?:-[^/]+)?)\/.*/i;
var match = dest.match(valueResourcesPattern);
if (match !== null) {
var resourceQualifier = match[1];
dest = path.join(destDir, resourceQualifier + '.xml');
destExists = fs.existsSync(dest);
}
}

if (destExists) {
Expand Down