Chromium Code Reviews| 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 # HOW TO WRITE CONDITIONALS IN THIS FILE | 5 # HOW TO WRITE CONDITIONALS IN THIS FILE |
| 6 # ====================================== | 6 # ====================================== |
| 7 # | 7 # |
| 8 # In many other places, one would write a conditional that expresses all the | 8 # In many other places, one would write a conditional that expresses all the |
| 9 # cases when a source file is used or unused, and then either add or subtract | 9 # cases when a source file is used or unused, and then either add or subtract |
| 10 # it from the sources list in that case | 10 # it from the sources list in that case |
| (...skipping 1111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1122 ] | 1122 ] |
| 1123 | 1123 |
| 1124 public_deps = [ | 1124 public_deps = [ |
| 1125 ":base_static", | 1125 ":base_static", |
| 1126 ":build_date", | 1126 ":build_date", |
| 1127 ":debugging_flags", | 1127 ":debugging_flags", |
| 1128 ] | 1128 ] |
| 1129 | 1129 |
| 1130 # Needed for <atomic> if using newer C++ library than sysroot | 1130 # Needed for <atomic> if using newer C++ library than sysroot |
| 1131 if (!use_sysroot && (is_android || (is_linux && !is_chromecast))) { | 1131 if (!use_sysroot && (is_android || (is_linux && !is_chromecast))) { |
| 1132 libs = [ "atomic" ] | 1132 # libatomic is not provided by the CrOS sysroot, so don't attempt |
| 1133 # to link to it under these circumstances. is_chromeos = true / | |
| 1134 # target_os = "chrome_os" are not exclusive to the CrOS sysroot | |
| 1135 # (since these can be built for desktop Linux too), so check the | |
| 1136 # toolchain to make sure. | |
| 1137 if (host_toolchain != "//build/toolchain/cros:host") { | |
|
Dirk Pranke
2017/04/25 19:18:06
I'd fold the comment and the check into the outer
| |
| 1138 libs = [ "atomic" ] | |
| 1139 } | |
| 1133 } | 1140 } |
| 1134 | 1141 |
| 1135 if (use_experimental_allocator_shim) { | 1142 if (use_experimental_allocator_shim) { |
| 1136 # TODO(primiano): support other platforms, currently this works only on | 1143 # TODO(primiano): support other platforms, currently this works only on |
| 1137 # Linux/CrOS/Android. http://crbug.com/550886 . | 1144 # Linux/CrOS/Android. http://crbug.com/550886 . |
| 1138 sources += [ | 1145 sources += [ |
| 1139 "allocator/allocator_shim.cc", | 1146 "allocator/allocator_shim.cc", |
| 1140 "allocator/allocator_shim.h", | 1147 "allocator/allocator_shim.h", |
| 1141 "allocator/allocator_shim_internals.h", | 1148 "allocator/allocator_shim_internals.h", |
| 1142 "allocator/allocator_shim_override_cpp_symbols.h", | 1149 "allocator/allocator_shim_override_cpp_symbols.h", |
| (...skipping 1549 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2692 } | 2699 } |
| 2693 | 2700 |
| 2694 fuzzer_test("base_json_correctness_fuzzer") { | 2701 fuzzer_test("base_json_correctness_fuzzer") { |
| 2695 sources = [ | 2702 sources = [ |
| 2696 "json/correctness_fuzzer.cc", | 2703 "json/correctness_fuzzer.cc", |
| 2697 ] | 2704 ] |
| 2698 deps = [ | 2705 deps = [ |
| 2699 ":base", | 2706 ":base", |
| 2700 ] | 2707 ] |
| 2701 } | 2708 } |
| OLD | NEW |