build/toolchain/mac/BUILD.gn - Issue 1946203002: [GN/iOS/Mac] Decouple copy_bundle_data from gyp mac_tool.py.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1946203002: [GN/iOS/Mac] Decouple copy_bundle_data from gyp mac_tool.py. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix path to the tool in toolchain definition after renaming said tool :-) Created 4 years, 7 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

Index: build/toolchain/mac/BUILD.gn

diff --git a/build/toolchain/mac/BUILD.gn b/build/toolchain/mac/BUILD.gn

index 571865c7fd3b277b578bca7e153e3315959c659f..2b7ee74215464439c1d65aac1f82347ca82599a6 100644

--- a/build/toolchain/mac/BUILD.gn

+++ b/build/toolchain/mac/BUILD.gn

@@ -239,12 +239,9 @@ template("mac_toolchain") {

}

tool("copy_bundle_data") {

- if (is_ios) {

- _convert_to_binary = "True"

- } else {

- _convert_to_binary = "False"

- }

- command = "rm -rf {{output}} && ./gyp-mac-tool copy-bundle-resource {{source}} {{output}} $_convert_to_binary"

+ _tool = rebase_path("//build/toolchain/mac/copy_bundle_data.py",

+ root_build_dir)

+ command = "python $_tool {{source}} {{output}}"

description = "COPY_BUNDLE_DATA {{source}} {{output}}"

}

tool("compile_xcassets") {

« no previous file with comments | « no previous file | build/toolchain/mac/copy_bundle_data.py » ('j') | no next file with comments »