| OLD | NEW | 
|---|
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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 # Toolchain-related configuration that may be needed outside the context of the | 5 # Toolchain-related configuration that may be needed outside the context of the | 
| 6 # toolchain() rules themselves. | 6 # toolchain() rules themselves. | 
| 7 | 7 | 
| 8 import("//build/config/chrome_build.gni") | 8 import("//build/config/chrome_build.gni") | 
| 9 | 9 | 
| 10 declare_args() { | 10 declare_args() { | 
| (...skipping 21 matching lines...) Expand all  Loading... | 
| 32 | 32 | 
| 33   # Compile with Xcode version of clang instead of hermetic version shipped | 33   # Compile with Xcode version of clang instead of hermetic version shipped | 
| 34   # with the build. Used on iOS to ship official builds (as they are built | 34   # with the build. Used on iOS to ship official builds (as they are built | 
| 35   # with the version of clang shipped with Xcode). | 35   # with the version of clang shipped with Xcode). | 
| 36   use_xcode_clang = is_ios && is_official_build | 36   use_xcode_clang = is_ios && is_official_build | 
| 37 } | 37 } | 
| 38 | 38 | 
| 39 declare_args() { | 39 declare_args() { | 
| 40   if (is_clang) { | 40   if (is_clang) { | 
| 41     # Clang compiler version. Clang files are placed at version-dependent paths. | 41     # Clang compiler version. Clang files are placed at version-dependent paths. | 
| 42     clang_version = "4.0.0" | 42     clang_version = "3.9.0" | 
| 43   } | 43   } | 
| 44 } | 44 } | 
| 45 | 45 | 
| 46 # Check target_os here instead of is_ios as this file is loaded for secondary | 46 # Check target_os here instead of is_ios as this file is loaded for secondary | 
| 47 # toolchain (host toolchain in particular) but the argument is the same for | 47 # toolchain (host toolchain in particular) but the argument is the same for | 
| 48 # all toolchains. | 48 # all toolchains. | 
| 49 assert(!use_xcode_clang || target_os == "ios", | 49 assert(!use_xcode_clang || target_os == "ios", | 
| 50        "Using Xcode's clang is only supported in iOS builds") | 50        "Using Xcode's clang is only supported in iOS builds") | 
| 51 | 51 | 
| 52 # Subdirectory within root_out_dir for shared library files. | 52 # Subdirectory within root_out_dir for shared library files. | 
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 92 stamp_description = "STAMP {{output}}" | 92 stamp_description = "STAMP {{output}}" | 
| 93 copy_description = "COPY {{source}} {{output}}" | 93 copy_description = "COPY {{source}} {{output}}" | 
| 94 if (host_os == "win") { | 94 if (host_os == "win") { | 
| 95   stamp_command = "$python_path gyp-win-tool stamp {{output}}" | 95   stamp_command = "$python_path gyp-win-tool stamp {{output}}" | 
| 96   copy_command = | 96   copy_command = | 
| 97       "$python_path gyp-win-tool recursive-mirror {{source}} {{output}}" | 97       "$python_path gyp-win-tool recursive-mirror {{source}} {{output}}" | 
| 98 } else { | 98 } else { | 
| 99   stamp_command = "touch {{output}}" | 99   stamp_command = "touch {{output}}" | 
| 100   copy_command = "ln -f {{source}} {{output}} 2>/dev/null || (rm -rf {{output}} 
     && cp -af {{source}} {{output}})" | 100   copy_command = "ln -f {{source}} {{output}} 2>/dev/null || (rm -rf {{output}} 
     && cp -af {{source}} {{output}})" | 
| 101 } | 101 } | 
| OLD | NEW | 
|---|