| Index: base/BUILD.gn
|
| diff --git a/base/BUILD.gn b/base/BUILD.gn
|
| index 244aec489aee05c4ff3fb83d2958f07f8e08da1b..0c4b35fa4cec2faca98dc4d73e87fe9f4fbd18b4 100644
|
| --- a/base/BUILD.gn
|
| +++ b/base/BUILD.gn
|
| @@ -1235,16 +1235,18 @@ component("base") {
|
| "synchronization/read_write_lock_nacl.cc",
|
| ]
|
|
|
| - # Add stuff that doesn't work in NaCl.
|
| - sources += [
|
| - # PartitionAlloc uses SpinLock, which doesn't work in NaCl (see below).
|
| - "allocator/partition_allocator/address_space_randomization.cc",
|
| - "allocator/partition_allocator/address_space_randomization.h",
|
| - "allocator/partition_allocator/page_allocator.cc",
|
| - "allocator/partition_allocator/page_allocator.h",
|
| - "allocator/partition_allocator/partition_alloc.cc",
|
| - "allocator/partition_allocator/partition_alloc.h",
|
| - ]
|
| + if (!is_ios) {
|
| + # Add stuff that doesn't work in NaCl.
|
| + sources += [
|
| + # PartitionAlloc uses SpinLock, which doesn't work in NaCl (see below).
|
| + "allocator/partition_allocator/address_space_randomization.cc",
|
| + "allocator/partition_allocator/address_space_randomization.h",
|
| + "allocator/partition_allocator/page_allocator.cc",
|
| + "allocator/partition_allocator/page_allocator.h",
|
| + "allocator/partition_allocator/partition_alloc.cc",
|
| + "allocator/partition_allocator/partition_alloc.h",
|
| + ]
|
| + }
|
| }
|
|
|
| # SpinLock uses inline assembly that doesn't work on NaCl, and for which there
|
| @@ -1807,7 +1809,6 @@ if (is_ios || is_mac) {
|
|
|
| test("base_unittests") {
|
| sources = [
|
| - "allocator/partition_allocator/partition_alloc_unittest.cc",
|
| "allocator/tcmalloc_unittest.cc",
|
| "android/application_status_listener_unittest.cc",
|
| "android/content_uri_utils_unittest.cc",
|
| @@ -2171,6 +2172,8 @@ test("base_unittests") {
|
| set_sources_assignment_filter(sources_assignment_filter)
|
|
|
| # TODO(GYP): dep on copy_test_data_ios action.
|
| + } else {
|
| + sources += [ "allocator/partition_allocator/partition_alloc_unittest.cc" ]
|
| }
|
|
|
| if (is_mac) {
|
|
|