Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2777)

Unified Diff: build/toolchain/mac/BUILD.gn

Issue 2130813002: [iOS] Remove conversion of .strings to binary1 by copy_bundle_data tool. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/toolchain/mac/BUILD.gn
diff --git a/build/toolchain/mac/BUILD.gn b/build/toolchain/mac/BUILD.gn
index a5ff08faffad70413eba86ad297d98e48531be61..72485c050293c84a15d071fe4a330ea62b4a5395 100644
--- a/build/toolchain/mac/BUILD.gn
+++ b/build/toolchain/mac/BUILD.gn
@@ -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)"
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698