Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3126)

Unified Diff: base/base.gyp

Issue 17106004: Add discardable memory emulation for non-android/mac platforms (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix MemoryAfterUnlock test Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | base/base.gypi » ('j') | base/memory/discardable_memory_emulated.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index 5dfe08dd56af42a1c4b81137a078eafdcca70155..baf8cd9b4dd5be520a4aa6ccd23e83404c519b8e 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -530,6 +530,7 @@
'md5_unittest.cc',
'memory/aligned_memory_unittest.cc',
'memory/discardable_memory_unittest.cc',
+ 'memory/discardable_memory_provider_unittest.cc',
'memory/linked_ptr_unittest.cc',
'memory/ref_counted_memory_unittest.cc',
'memory/ref_counted_unittest.cc',
@@ -830,6 +831,11 @@
'third_party/nspr/nspr.gyp:nspr',
],
}],
+ ['<(native_discardable_memory)==1', {
+ 'sources!': [
+ 'memory/discardable_memory_provider_unittest.cc',
+ ],
+ }],
], # conditions
'target_conditions': [
['OS == "ios" and _toolset != "host"', {
« no previous file with comments | « no previous file | base/base.gypi » ('j') | base/memory/discardable_memory_emulated.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698