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 1110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1121 "//third_party/modp_b64", | 1121 "//third_party/modp_b64", |
| 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))) { |
|
gurchetansingh
2017/04/20 21:43:13
You can simplify with an !is_chromeos check here.
richard.townsend
2017/04/21 11:31:52
That's what I thought, but surprisingly it doesn't
Dirk Pranke
2017/04/24 21:12:22
If I understand this correctly, basically the prob
richard.townsend
2017/04/25 14:09:34
I did some further investigation on the native Lin
| |
| 1132 libs = [ "atomic" ] | 1132 if (target_os != "chromeos") { |
| 1133 libs = [ "atomic" ] | |
| 1134 } | |
| 1133 } | 1135 } |
| 1134 | 1136 |
| 1135 if (use_experimental_allocator_shim) { | 1137 if (use_experimental_allocator_shim) { |
| 1136 # TODO(primiano): support other platforms, currently this works only on | 1138 # TODO(primiano): support other platforms, currently this works only on |
| 1137 # Linux/CrOS/Android. http://crbug.com/550886 . | 1139 # Linux/CrOS/Android. http://crbug.com/550886 . |
| 1138 sources += [ | 1140 sources += [ |
| 1139 "allocator/allocator_shim.cc", | 1141 "allocator/allocator_shim.cc", |
| 1140 "allocator/allocator_shim.h", | 1142 "allocator/allocator_shim.h", |
| 1141 "allocator/allocator_shim_internals.h", | 1143 "allocator/allocator_shim_internals.h", |
| 1142 "allocator/allocator_shim_override_cpp_symbols.h", | 1144 "allocator/allocator_shim_override_cpp_symbols.h", |
| (...skipping 1549 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2692 } | 2694 } |
| 2693 | 2695 |
| 2694 fuzzer_test("base_json_correctness_fuzzer") { | 2696 fuzzer_test("base_json_correctness_fuzzer") { |
| 2695 sources = [ | 2697 sources = [ |
| 2696 "json/correctness_fuzzer.cc", | 2698 "json/correctness_fuzzer.cc", |
| 2697 ] | 2699 ] |
| 2698 deps = [ | 2700 deps = [ |
| 2699 ":base", | 2701 ":base", |
| 2700 ] | 2702 ] |
| 2701 } | 2703 } |
| OLD | NEW |