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

Unified Diff: base/base.gyp

Issue 195863005: Use DiscardableMemoryManager on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add |DiscardableMemoryAshmem::is_locked| Created 6 years, 8 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') | no next file with comments »
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 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$'],
« no previous file with comments | « no previous file | base/base.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698