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

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

Issue 2106353004: Implement "copy_bundle_data" tool without using a python script. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@create-bundle-deps
Patch Set: Created 4 years, 6 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 | build/toolchain/mac/copy_bundle_data.py » ('j') | 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 231a546891d463367ebcdce18584116f5d5f92fa..08474e42e146bb68f949a4db33a97d0029d8489e 100644
--- a/build/toolchain/mac/BUILD.gn
+++ b/build/toolchain/mac/BUILD.gn
@@ -64,7 +64,6 @@ tool_versions =
exec_script("get_tool_mtime.py",
rebase_path([
"//build/toolchain/mac/compile_xcassets.py",
- "//build/toolchain/mac/copy_bundle_data.py",
"//build/toolchain/mac/filter_libtool.py",
"//build/toolchain/mac/linker_driver.py",
],
@@ -307,14 +306,19 @@ template("mac_toolchain") {
}
tool("copy_bundle_data") {
- if (is_ios) {
- _extra_args = "--strings-format=binary1"
- } else {
- _extra_args = ""
+ _command = "if [[ -d {{source}} ]]; then " +
Robert Sesek 2016/06/30 17:28:02 This is missing the rm step first.
sdefresne 2016/07/01 11:12:29 Fixed.
+ "rsync --recursive --perms --links {{source}}/ {{output}}; " +
+ "else " + copy_command + "; fi"
+
+ _convert_strings = is_ios
+ if (_convert_strings) {
Robert Sesek 2016/06/30 17:28:02 Should we just make string conversion a separate s
sdefresne 2016/07/01 11:12:29 I think we should do it as a separate step, howeve
Robert Sesek 2016/07/01 15:12:17 Yes, fine to do that in a follow up. Can you file
+ _command =
+ "case {{source}} in " +
+ "*.strings) plutil -convert binary1 -o {{output}} {{source}};; " +
+ "*) " + _command + ";; esac"
}
- _tool = rebase_path("//build/toolchain/mac/copy_bundle_data.py",
- root_build_dir)
- command = "TOOL_VERSION=${tool_versions.copy_bundle_data} python $_tool ${_extra_args} {{source}} {{output}}"
+
+ command = _command
description = "COPY_BUNDLE_DATA {{source}} {{output}}"
pool = ":bundle_pool($default_toolchain)"
}
« no previous file with comments | « no previous file | build/toolchain/mac/copy_bundle_data.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698