OLD | NEW |
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/clang/clang.gni") | 10 import("//build/config/clang/clang.gni") |
(...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
399 if (is_ios) { | 399 if (is_ios) { |
400 _sdk_name = ios_sdk_name | 400 _sdk_name = ios_sdk_name |
401 _min_deployment_target = ios_deployment_target | 401 _min_deployment_target = ios_deployment_target |
402 } else { | 402 } else { |
403 _sdk_name = mac_sdk_name | 403 _sdk_name = mac_sdk_name |
404 _min_deployment_target = mac_deployment_target | 404 _min_deployment_target = mac_deployment_target |
405 } | 405 } |
406 command = "rm -f {{output}} && " + | 406 command = "rm -f {{output}} && " + |
407 "TOOL_VERSION=${tool_versions.compile_xcassets} " + | 407 "TOOL_VERSION=${tool_versions.compile_xcassets} " + |
408 "python $_tool -p $_sdk_name -t $_min_deployment_target " + | 408 "python $_tool -p $_sdk_name -t $_min_deployment_target " + |
409 "-o {{output}} {{inputs}}" | 409 "-T {{bundle_product_type}} -o {{output}} {{inputs}}" |
410 | 410 |
411 description = "COMPILE_XCASSETS {{output}}" | 411 description = "COMPILE_XCASSETS {{output}}" |
412 pool = ":bundle_pool($default_toolchain)" | 412 pool = ":bundle_pool($default_toolchain)" |
413 } | 413 } |
414 } | 414 } |
415 } | 415 } |
416 | 416 |
417 mac_toolchain("clang_arm") { | 417 mac_toolchain("clang_arm") { |
418 toolchain_args = { | 418 toolchain_args = { |
419 current_cpu = "arm" | 419 current_cpu = "arm" |
(...skipping 30 matching lines...) Expand all Loading... |
450 } | 450 } |
451 } | 451 } |
452 | 452 |
453 mac_toolchain("ios_clang_x64") { | 453 mac_toolchain("ios_clang_x64") { |
454 toolchain_args = { | 454 toolchain_args = { |
455 current_cpu = "x64" | 455 current_cpu = "x64" |
456 current_os = "ios" | 456 current_os = "ios" |
457 } | 457 } |
458 } | 458 } |
459 } | 459 } |
OLD | NEW |