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

Side by Side 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, 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | base/base.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../build/win_precompile.gypi', 10 '../build/win_precompile.gypi',
(...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 'logging_unittest.cc', 467 'logging_unittest.cc',
468 'mac/bind_objc_block_unittest.mm', 468 'mac/bind_objc_block_unittest.mm',
469 'mac/foundation_util_unittest.mm', 469 'mac/foundation_util_unittest.mm',
470 'mac/libdispatch_task_runner_unittest.cc', 470 'mac/libdispatch_task_runner_unittest.cc',
471 'mac/mac_util_unittest.mm', 471 'mac/mac_util_unittest.mm',
472 'mac/objc_property_releaser_unittest.mm', 472 'mac/objc_property_releaser_unittest.mm',
473 'mac/scoped_nsobject_unittest.mm', 473 'mac/scoped_nsobject_unittest.mm',
474 'mac/scoped_sending_event_unittest.mm', 474 'mac/scoped_sending_event_unittest.mm',
475 'md5_unittest.cc', 475 'md5_unittest.cc',
476 'memory/aligned_memory_unittest.cc', 476 'memory/aligned_memory_unittest.cc',
477 'memory/discardable_memory_allocator_android_unittest.cc',
478 'memory/discardable_memory_manager_unittest.cc', 477 'memory/discardable_memory_manager_unittest.cc',
479 'memory/discardable_memory_unittest.cc', 478 'memory/discardable_memory_unittest.cc',
480 'memory/linked_ptr_unittest.cc', 479 'memory/linked_ptr_unittest.cc',
481 'memory/ref_counted_memory_unittest.cc', 480 'memory/ref_counted_memory_unittest.cc',
482 'memory/ref_counted_unittest.cc', 481 'memory/ref_counted_unittest.cc',
483 'memory/scoped_ptr_unittest.cc', 482 'memory/scoped_ptr_unittest.cc',
484 'memory/scoped_ptr_unittest.nc', 483 'memory/scoped_ptr_unittest.nc',
485 'memory/scoped_vector_unittest.cc', 484 'memory/scoped_vector_unittest.cc',
486 'memory/shared_memory_unittest.cc', 485 'memory/shared_memory_unittest.cc',
487 'memory/singleton_unittest.cc', 486 'memory/singleton_unittest.cc',
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
749 'sources/': [ 748 'sources/': [
750 # Pull in specific Mac files for iOS (which have been filtered out 749 # Pull in specific Mac files for iOS (which have been filtered out
751 # by file name rules). 750 # by file name rules).
752 ['include', '^mac/bind_objc_block_unittest\\.mm$'], 751 ['include', '^mac/bind_objc_block_unittest\\.mm$'],
753 ['include', '^mac/foundation_util_unittest\\.mm$',], 752 ['include', '^mac/foundation_util_unittest\\.mm$',],
754 ['include', '^mac/objc_property_releaser_unittest\\.mm$'], 753 ['include', '^mac/objc_property_releaser_unittest\\.mm$'],
755 ['include', '^mac/scoped_nsobject_unittest\\.mm$'], 754 ['include', '^mac/scoped_nsobject_unittest\\.mm$'],
756 ['include', '^sys_string_conversions_mac_unittest\\.mm$'], 755 ['include', '^sys_string_conversions_mac_unittest\\.mm$'],
757 ], 756 ],
758 }], 757 }],
758 ['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.
759 'sources': [
760 'memory/discardable_memory_ashmem_allocator_unittest.cc',
761 ],
762 }],
759 ['OS == "android"', { 763 ['OS == "android"', {
760 'sources/': [ 764 'sources/': [
761 ['include', '^debug/proc_maps_linux_unittest\\.cc$'], 765 ['include', '^debug/proc_maps_linux_unittest\\.cc$'],
762 ], 766 ],
763 }], 767 }],
764 ], # target_conditions 768 ], # target_conditions
765 }, 769 },
766 { 770 {
767 'target_name': 'base_perftests', 771 'target_name': 'base_perftests',
768 'type': '<(gtest_target_type)', 772 'type': '<(gtest_target_type)',
(...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after
1447 'base_unittests.isolate', 1451 'base_unittests.isolate',
1448 ], 1452 ],
1449 'sources': [ 1453 'sources': [
1450 'base_unittests.isolate', 1454 'base_unittests.isolate',
1451 ], 1455 ],
1452 }, 1456 },
1453 ], 1457 ],
1454 }], 1458 }],
1455 ], 1459 ],
1456 } 1460 }
OLDNEW
« 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