Commit f52c49dc authored by sdefresne's avatar sdefresne Committed by Commit bot

[iOS] Remove conversion of .strings to binary1 by copy_bundle_data tool.

All .strings files that need to be in binary1 format are now
converted by using the "bundle_data_strings" template so the
conversion can be remove from "copy_bundle_data" tool.

BUG=625578

Review-Url: https://codereview.chromium.org/2130813002
Cr-Commit-Position: refs/heads/master@{#404621}
parent a6b91467
......@@ -326,19 +326,9 @@ template("mac_toolchain") {
# using pwd would requires a sub-shell to be created.
_copydir = "mkdir -p {{output}} && cd {{source}} && " +
"pax -rwl . \"\$OLDPWD\"/{{output}}"
_command = "if [[ -d {{source}} ]]; then " + _copydir + "; else " +
copy_command + "; fi"
# TODO(crbug.com/625578): Remove this conversion on iOS once all the
# bundle_data target have been fixed to reference converted files.
_convert_strings = is_ios
if (_convert_strings) {
_convert = "plutil -convert binary1 -o {{output}} {{source}}"
_command = "case {{source}} in " + "*.strings) " + _convert + ";; " +
"*) " + _command + ";; esac"
}
command = "rm -rf {{output}} && if [[ -d {{source}} ]]; then " +
_copydir + "; else " + copy_command + "; fi"
command = "rm -rf {{output}} && " + _command
description = "COPY_BUNDLE_DATA {{source}} {{output}}"
pool = ":bundle_pool($default_toolchain)"
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment