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 1202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1213 } | 1213 } |
| 1214 } else { | 1214 } else { |
| 1215 # Remove NaCl stuff. | 1215 # Remove NaCl stuff. |
| 1216 sources -= [ | 1216 sources -= [ |
| 1217 "memory/shared_memory_nacl.cc", | 1217 "memory/shared_memory_nacl.cc", |
| 1218 "os_compat_nacl.cc", | 1218 "os_compat_nacl.cc", |
| 1219 "os_compat_nacl.h", | 1219 "os_compat_nacl.h", |
| 1220 "rand_util_nacl.cc", | 1220 "rand_util_nacl.cc", |
| 1221 "synchronization/read_write_lock_nacl.cc", | 1221 "synchronization/read_write_lock_nacl.cc", |
| 1222 ] | 1222 ] |
| 1223 | |
| 1224 # Add stuff that doesn't work in NaCl. | |
| 1225 sources += [ | |
|
gab
2016/12/05 18:51:48
Add these to all sources and instead add the excep
palmer
2016/12/06 00:58:25
In an earlier code review, thakis said the general
gab
2016/12/06 15:43:21
Interesting, I'll discuss with him offline. I thou
gab
2016/12/06 15:55:06
Spoke with Nico, preference is now sources += in G
| |
| 1226 # PartitionAlloc uses SpinLock, which doesn't work in NaCl (see below). | |
| 1227 "allocator/partition_allocator/address_space_randomization.cc", | |
| 1228 "allocator/partition_allocator/address_space_randomization.h", | |
| 1229 "allocator/partition_allocator/page_allocator.cc", | |
| 1230 "allocator/partition_allocator/page_allocator.h", | |
| 1231 "allocator/partition_allocator/partition_alloc.cc", | |
| 1232 "allocator/partition_allocator/partition_alloc.h", | |
| 1233 ] | |
| 1223 } | 1234 } |
| 1224 | 1235 |
| 1225 # SpinLock uses inline assembly that doesn't work on NaCl, and for which there | 1236 # SpinLock uses inline assembly that doesn't work on NaCl, and for which there |
| 1226 # is no code for ARMv6. | 1237 # is no code for ARMv6. |
| 1227 if (!is_nacl && (current_cpu != "arm" || arm_version >= 7)) { | 1238 if (!is_nacl && (current_cpu != "arm" || arm_version >= 7)) { |
| 1228 sources += [ | 1239 sources += [ |
| 1229 "synchronization/spin_lock.cc", | 1240 "synchronization/spin_lock.cc", |
| 1230 "synchronization/spin_lock.h", | 1241 "synchronization/spin_lock.h", |
| 1231 ] | 1242 ] |
| 1232 } | 1243 } |
| (...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1778 configs += [ "//build/config/compiler:enable_arc" ] | 1789 configs += [ "//build/config/compiler:enable_arc" ] |
| 1779 deps = [ | 1790 deps = [ |
| 1780 ":base", | 1791 ":base", |
| 1781 "//testing/gtest", | 1792 "//testing/gtest", |
| 1782 ] | 1793 ] |
| 1783 } | 1794 } |
| 1784 } | 1795 } |
| 1785 | 1796 |
| 1786 test("base_unittests") { | 1797 test("base_unittests") { |
| 1787 sources = [ | 1798 sources = [ |
| 1799 "allocator/partition_allocator/partition_alloc_unittest.cc", | |
| 1788 "allocator/tcmalloc_unittest.cc", | 1800 "allocator/tcmalloc_unittest.cc", |
| 1789 "android/application_status_listener_unittest.cc", | 1801 "android/application_status_listener_unittest.cc", |
| 1790 "android/content_uri_utils_unittest.cc", | 1802 "android/content_uri_utils_unittest.cc", |
| 1791 "android/jni_android_unittest.cc", | 1803 "android/jni_android_unittest.cc", |
| 1792 "android/jni_array_unittest.cc", | 1804 "android/jni_array_unittest.cc", |
| 1793 "android/jni_string_unittest.cc", | 1805 "android/jni_string_unittest.cc", |
| 1794 "android/library_loader/library_prefetcher_unittest.cc", | 1806 "android/library_loader/library_prefetcher_unittest.cc", |
| 1795 "android/path_utils_unittest.cc", | 1807 "android/path_utils_unittest.cc", |
| 1796 "android/scoped_java_ref_unittest.cc", | 1808 "android/scoped_java_ref_unittest.cc", |
| 1797 "android/sys_utils_unittest.cc", | 1809 "android/sys_utils_unittest.cc", |
| (...skipping 728 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2526 } | 2538 } |
| 2527 | 2539 |
| 2528 fuzzer_test("base_json_correctness_fuzzer") { | 2540 fuzzer_test("base_json_correctness_fuzzer") { |
| 2529 sources = [ | 2541 sources = [ |
| 2530 "json/correctness_fuzzer.cc", | 2542 "json/correctness_fuzzer.cc", |
| 2531 ] | 2543 ] |
| 2532 deps = [ | 2544 deps = [ |
| 2533 ":base", | 2545 ":base", |
| 2534 ] | 2546 ] |
| 2535 } | 2547 } |
| OLD | NEW |