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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « no previous file | build/toolchain/mac/copy_bundle_data.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # TODO(brettw) Use "gcc_toolchain.gni" like the Linux toolchains. This requires 5 # TODO(brettw) Use "gcc_toolchain.gni" like the Linux toolchains. This requires
6 # some enhancements since the commands on Mac are slightly different than on 6 # some enhancements since the commands on Mac are slightly different than on
7 # Linux. 7 # Linux.
8 8
9 import("../goma.gni") 9 import("../goma.gni")
10 import("//build/config/ios/ios_sdk.gni") 10 import("//build/config/ios/ios_sdk.gni")
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 tool("stamp") { 232 tool("stamp") {
233 command = stamp_command 233 command = stamp_command
234 description = stamp_description 234 description = stamp_description
235 } 235 }
236 tool("copy") { 236 tool("copy") {
237 command = copy_command 237 command = copy_command
238 description = copy_description 238 description = copy_description
239 } 239 }
240 240
241 tool("copy_bundle_data") { 241 tool("copy_bundle_data") {
242 if (is_ios) { 242 _tool = rebase_path("//build/toolchain/mac/copy_bundle_data.py",
243 _convert_to_binary = "True" 243 root_build_dir)
244 } else { 244 command = "python $_tool {{source}} {{output}}"
245 _convert_to_binary = "False"
246 }
247 command = "rm -rf {{output}} && ./gyp-mac-tool copy-bundle-resource {{sour ce}} {{output}} $_convert_to_binary"
248 description = "COPY_BUNDLE_DATA {{source}} {{output}}" 245 description = "COPY_BUNDLE_DATA {{source}} {{output}}"
249 } 246 }
250 tool("compile_xcassets") { 247 tool("compile_xcassets") {
251 if (is_ios) { 248 if (is_ios) {
252 _configuration = "Release" 249 _configuration = "Release"
253 if (is_debug) { 250 if (is_debug) {
254 _configuration = "Debug" 251 _configuration = "Debug"
255 } 252 }
256 253
257 _compile_xcassets_env = 254 _compile_xcassets_env =
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 } 357 }
361 358
362 mac_toolchain("x64") { 359 mac_toolchain("x64") {
363 toolchain_cpu = "x64" 360 toolchain_cpu = "x64"
364 toolchain_os = "mac" 361 toolchain_os = "mac"
365 cc = "${goma_prefix}/gcc" 362 cc = "${goma_prefix}/gcc"
366 cxx = "${goma_prefix}/g++" 363 cxx = "${goma_prefix}/g++"
367 ld = cxx 364 ld = cxx
368 is_clang = false 365 is_clang = false
369 } 366 }
OLDNEW
« 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