Chromium Code Reviews| Index: base/BUILD.gn |
| diff --git a/base/BUILD.gn b/base/BUILD.gn |
| index 0c4b35fa4cec2faca98dc4d73e87fe9f4fbd18b4..beecfffd26b7f8a4a8baef99bc7569081383b3c9 100644 |
| --- a/base/BUILD.gn |
| +++ b/base/BUILD.gn |
| @@ -41,6 +41,9 @@ declare_args() { |
| # available, except for official builds for now. |
| enable_memory_task_profiler = |
| use_experimental_allocator_shim && (!is_official_build || is_syzyasan) |
| + |
| + # Partition alloc is included by default except iOS. |
| + exclude_partition_alloc = is_ios |
|
palmer
2016/12/14 23:28:53
Nit: My instinct is to phrase this the other way:
xunjieli
2016/12/15 15:07:53
Done. Makes sense. Since I probably won't touch th
|
| } |
| if (is_android) { |
| @@ -1235,7 +1238,7 @@ component("base") { |
| "synchronization/read_write_lock_nacl.cc", |
| ] |
| - if (!is_ios) { |
| + if (!exclude_partition_alloc) { |
| # Add stuff that doesn't work in NaCl. |
| sources += [ |
| # PartitionAlloc uses SpinLock, which doesn't work in NaCl (see below). |
| @@ -2172,7 +2175,9 @@ test("base_unittests") { |
| set_sources_assignment_filter(sources_assignment_filter) |
| # TODO(GYP): dep on copy_test_data_ios action. |
| - } else { |
| + } |
| + |
| + if (!exclude_partition_alloc) { |
| sources += [ "allocator/partition_allocator/partition_alloc_unittest.cc" ] |
| } |