| Index: base/base.gyp
|
| diff --git a/base/base.gyp b/base/base.gyp
|
| index 06ad10bfb3c002c8cf60ad42641111d3a104120a..f2151b3521e061a2a74dcc62d53ce627658fab8f 100644
|
| --- a/base/base.gyp
|
| +++ b/base/base.gyp
|
| @@ -474,6 +474,7 @@
|
| 'mac/scoped_sending_event_unittest.mm',
|
| 'md5_unittest.cc',
|
| 'memory/aligned_memory_unittest.cc',
|
| + 'memory/discardable_memory_allocator_android_unittest.cc',
|
| 'memory/discardable_memory_manager_unittest.cc',
|
| 'memory/discardable_memory_unittest.cc',
|
| 'memory/linked_ptr_unittest.cc',
|
| @@ -755,11 +756,6 @@
|
| ['include', '^sys_string_conversions_mac_unittest\\.mm$'],
|
| ],
|
| }],
|
| - ['OS == "android" and _toolset == "target"', {
|
| - 'sources': [
|
| - 'memory/discardable_memory_ashmem_allocator_unittest.cc',
|
| - ],
|
| - }],
|
| ['OS == "android"', {
|
| 'sources/': [
|
| ['include', '^debug/proc_maps_linux_unittest\\.cc$'],
|
|
|