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 1196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1207 } | 1207 } |
| 1208 } else { | 1208 } else { |
| 1209 # Remove NaCl stuff. | 1209 # Remove NaCl stuff. |
| 1210 sources -= [ | 1210 sources -= [ |
| 1211 "memory/shared_memory_nacl.cc", | 1211 "memory/shared_memory_nacl.cc", |
| 1212 "os_compat_nacl.cc", | 1212 "os_compat_nacl.cc", |
| 1213 "os_compat_nacl.h", | 1213 "os_compat_nacl.h", |
| 1214 "rand_util_nacl.cc", | 1214 "rand_util_nacl.cc", |
| 1215 "synchronization/read_write_lock_nacl.cc", | 1215 "synchronization/read_write_lock_nacl.cc", |
| 1216 ] | 1216 ] |
| 1217 | |
| 1218 # Add stuff that doesn't work in NaCl. | |
| 1219 sources += [ | |
| 1220 # PartitionAlloc uses SpinLock, which doesn't work in NaCl (see below). | |
|
Primiano Tucci (use gerrit)
2016/11/28 12:06:50
you are moving the partition_alloc_unittest.cc but
palmer
2016/12/01 00:48:23
Thanks, fixed.
| |
| 1221 "allocator/partition_allocator/address_space_randomization.cc", | |
| 1222 "allocator/partition_allocator/address_space_randomization.h", | |
| 1223 "allocator/partition_allocator/page_allocator.cc", | |
| 1224 "allocator/partition_allocator/page_allocator.h", | |
| 1225 "allocator/partition_allocator/partition_alloc.cc", | |
| 1226 "allocator/partition_allocator/partition_alloc.h", | |
| 1227 "allocator/partition_allocator/partition_allocator.cc", | |
| 1228 "allocator/partition_allocator/partition_allocator.h", | |
| 1229 "allocator/partition_allocator/partitions.cc", | |
| 1230 "allocator/partition_allocator/partitions.h", | |
| 1231 ] | |
| 1217 } | 1232 } |
| 1218 | 1233 |
| 1219 # SpinLock uses inline assembly that doesn't work on NaCl, and for which there | 1234 # SpinLock uses inline assembly that doesn't work on NaCl, and for which there |
| 1220 # is no code for ARMv6. | 1235 # is no code for ARMv6. |
| 1221 if (!is_nacl && (current_cpu != "arm" || arm_version >= 7)) { | 1236 if (!is_nacl && (current_cpu != "arm" || arm_version >= 7)) { |
| 1222 sources += [ | 1237 sources += [ |
| 1223 "synchronization/spin_lock.cc", | 1238 "synchronization/spin_lock.cc", |
| 1224 "synchronization/spin_lock.h", | 1239 "synchronization/spin_lock.h", |
| 1225 ] | 1240 ] |
| 1226 } | 1241 } |
| (...skipping 1285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2512 } | 2527 } |
| 2513 | 2528 |
| 2514 fuzzer_test("base_json_correctness_fuzzer") { | 2529 fuzzer_test("base_json_correctness_fuzzer") { |
| 2515 sources = [ | 2530 sources = [ |
| 2516 "json/correctness_fuzzer.cc", | 2531 "json/correctness_fuzzer.cc", |
| 2517 ] | 2532 ] |
| 2518 deps = [ | 2533 deps = [ |
| 2519 ":base", | 2534 ":base", |
| 2520 ] | 2535 ] |
| 2521 } | 2536 } |
| OLD | NEW |