| 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 1110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1121 "//base/third_party/dynamic_annotations", | 1121 "//base/third_party/dynamic_annotations", |
| 1122 "//third_party/modp_b64", | 1122 "//third_party/modp_b64", |
| 1123 ] | 1123 ] |
| 1124 | 1124 |
| 1125 public_deps = [ | 1125 public_deps = [ |
| 1126 ":base_static", | 1126 ":base_static", |
| 1127 ":build_date", | 1127 ":build_date", |
| 1128 ":debugging_flags", | 1128 ":debugging_flags", |
| 1129 ] | 1129 ] |
| 1130 | 1130 |
| 1131 # Needed for <atomic> if using newer C++ library than sysroot | 1131 # Needed for <atomic> if using newer C++ library than sysroot, except if |
| 1132 if (!use_sysroot && (is_android || (is_linux && !is_chromecast))) { | 1132 # building inside the cros_sdk environment - use host_toolchain as a |
| 1133 # more robust check for this. |
| 1134 if (!use_sysroot && (is_android || (is_linux && !is_chromecast)) && |
| 1135 host_toolchain != "//build/toolchain/cros:host") { |
| 1133 libs = [ "atomic" ] | 1136 libs = [ "atomic" ] |
| 1134 } | 1137 } |
| 1135 | 1138 |
| 1136 if (use_experimental_allocator_shim) { | 1139 if (use_experimental_allocator_shim) { |
| 1137 # TODO(primiano): support other platforms, currently this works only on | 1140 # TODO(primiano): support other platforms, currently this works only on |
| 1138 # Linux/CrOS/Android. http://crbug.com/550886 . | 1141 # Linux/CrOS/Android. http://crbug.com/550886 . |
| 1139 sources += [ | 1142 sources += [ |
| 1140 "allocator/allocator_shim.cc", | 1143 "allocator/allocator_shim.cc", |
| 1141 "allocator/allocator_shim.h", | 1144 "allocator/allocator_shim.h", |
| 1142 "allocator/allocator_shim_internals.h", | 1145 "allocator/allocator_shim_internals.h", |
| (...skipping 1550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2693 } | 2696 } |
| 2694 | 2697 |
| 2695 fuzzer_test("base_json_correctness_fuzzer") { | 2698 fuzzer_test("base_json_correctness_fuzzer") { |
| 2696 sources = [ | 2699 sources = [ |
| 2697 "json/correctness_fuzzer.cc", | 2700 "json/correctness_fuzzer.cc", |
| 2698 ] | 2701 ] |
| 2699 deps = [ | 2702 deps = [ |
| 2700 ":base", | 2703 ":base", |
| 2701 ] | 2704 ] |
| 2702 } | 2705 } |
| OLD | NEW |