| 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 51 tool_versions = | 51 tool_versions = | 
| 52     exec_script("get_tool_mtime.py", | 52     exec_script("get_tool_mtime.py", | 
| 53                 rebase_path([ | 53                 rebase_path([ | 
| 54                               "//build/toolchain/mac/compile_xcassets.py", | 54                               "//build/toolchain/mac/compile_xcassets.py", | 
| 55                               "//build/toolchain/mac/filter_libtool.py", | 55                               "//build/toolchain/mac/filter_libtool.py", | 
| 56                               "//build/toolchain/mac/linker_driver.py", | 56                               "//build/toolchain/mac/linker_driver.py", | 
| 57                             ], | 57                             ], | 
| 58                             root_build_dir), | 58                             root_build_dir), | 
| 59                 "trim scope") | 59                 "trim scope") | 
| 60 | 60 | 
| 61 # Work around for unused variable warning in template https://crbug.com/395883. |  | 
| 62 assert(tool_versions != "") |  | 
| 63 |  | 
| 64 # Shared toolchain definition. Invocations should set current_os to set the | 61 # Shared toolchain definition. Invocations should set current_os to set the | 
| 65 # build args in this definition. | 62 # build args in this definition. | 
| 66 template("mac_toolchain") { | 63 template("mac_toolchain") { | 
| 67   toolchain(target_name) { | 64   toolchain(target_name) { | 
| 68     # When invoking this toolchain not as the default one, these args will be | 65     # When invoking this toolchain not as the default one, these args will be | 
| 69     # passed to the build. They are ignored when this is the default toolchain. | 66     # passed to the build. They are ignored when this is the default toolchain. | 
| 70     assert(defined(invoker.toolchain_args), | 67     assert(defined(invoker.toolchain_args), | 
| 71            "Toolchains must declare toolchain_args") | 68            "Toolchains must declare toolchain_args") | 
| 72     toolchain_args = { | 69     toolchain_args = { | 
| 73       # Populate toolchain args from the invoker. | 70       # Populate toolchain args from the invoker. | 
| (...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 450     } | 447     } | 
| 451   } | 448   } | 
| 452 | 449 | 
| 453   mac_toolchain("ios_clang_x64") { | 450   mac_toolchain("ios_clang_x64") { | 
| 454     toolchain_args = { | 451     toolchain_args = { | 
| 455       current_cpu = "x64" | 452       current_cpu = "x64" | 
| 456       current_os = "ios" | 453       current_os = "ios" | 
| 457     } | 454     } | 
| 458   } | 455   } | 
| 459 } | 456 } | 
| OLD | NEW | 
|---|