| Index: base/base.gypi
|
| diff --git a/base/base.gypi b/base/base.gypi
|
| index b60ffa6feb9b7a0ac4bb773ac6111710b953ab5f..eeda3e12d7a160275dfab40d7ab10954c4c2bc08 100644
|
| --- a/base/base.gypi
|
| +++ b/base/base.gypi
|
| @@ -283,10 +283,12 @@
|
| 'mac/sdk_forward_declarations.h',
|
| 'memory/aligned_memory.cc',
|
| 'memory/aligned_memory.h',
|
| - 'memory/discardable_memory.cc',
|
| 'memory/discardable_memory.h',
|
| 'memory/discardable_memory_android.cc',
|
| + 'memory/discardable_memory_emulated.cc',
|
| 'memory/discardable_memory_mac.cc',
|
| + 'memory/discardable_memory_provider.cc',
|
| + 'memory/discardable_memory_provider.h',
|
| 'memory/linked_ptr.h',
|
| 'memory/manual_constructor.h',
|
| 'memory/memory_pressure_listener.cc',
|
| @@ -847,6 +849,14 @@
|
| 'sources/': [ ['exclude', '^win/'] ],
|
| },
|
| ],
|
| + ['<(native_discardable_memory)==1', {
|
| + 'sources!': [
|
| + 'memory/discardable_memory_emulated.cc',
|
| + 'memory/discardable_memory_provider.cc',
|
| + 'memory/discardable_memory_provider.h',
|
| + ],
|
| + },
|
| + ],
|
| ['OS != "android" or >(nacl_untrusted_build)==1', {
|
| 'sources/': [ ['exclude', '^android/'] ],
|
| },
|
|
|