Chromium Code Reviews| Index: base/base.gyp |
| diff --git a/base/base.gyp b/base/base.gyp |
| index f2151b3521e061a2a74dcc62d53ce627658fab8f..06ad10bfb3c002c8cf60ad42641111d3a104120a 100644 |
| --- a/base/base.gyp |
| +++ b/base/base.gyp |
| @@ -474,7 +474,6 @@ |
| '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', |
| @@ -756,6 +755,11 @@ |
| ['include', '^sys_string_conversions_mac_unittest\\.mm$'], |
| ], |
| }], |
| + ['OS == "android" and _toolset == "target"', { |
|
willchan no longer on Chromium
2014/04/30 06:38:21
Can you explain why this is restricted to "target"
Philippe
2014/04/30 08:38:10
David also asked about it in the first patch set.
|
| + 'sources': [ |
| + 'memory/discardable_memory_ashmem_allocator_unittest.cc', |
| + ], |
| + }], |
| ['OS == "android"', { |
| 'sources/': [ |
| ['include', '^debug/proc_maps_linux_unittest\\.cc$'], |