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

Side by Side Diff: base/base.gyp

Issue 1675143004: Allocator shim skeleton + Linux impl behind a build flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@shim_exp_flag
Patch Set: cleanup Created 4 years, 10 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
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',
11 'base.gypi', 11 'base.gypi',
12 ], 12 ],
13 'targets': [ 13 'targets': [
14 { 14 {
15 'target_name': 'base', 15 'target_name': 'base',
16 'type': '<(component)', 16 'type': '<(component)',
17 'toolsets': ['host', 'target'], 17 'toolsets': ['host', 'target'],
18 'variables': { 18 'variables': {
19 'base_target': 1, 19 'base_target': 1,
20 'enable_wexit_time_destructors': 1, 20 'enable_wexit_time_destructors': 1,
21 'optimize': 'max', 21 'optimize': 'max',
22 }, 22 },
23 'dependencies': [ 23 'dependencies': [
24 'allocator/allocator.gyp:allocator', 24 'allocator/allocator.gyp:allocator',
25 'allocator/allocator.gyp:allocator_features',
25 'base_debugging_flags#target', 26 'base_debugging_flags#target',
26 'base_static', 27 'base_static',
27 'base_build_date#target', 28 'base_build_date#target',
28 '../testing/gtest.gyp:gtest_prod', 29 '../testing/gtest.gyp:gtest_prod',
29 '../third_party/modp_b64/modp_b64.gyp:modp_b64', 30 '../third_party/modp_b64/modp_b64.gyp:modp_b64',
30 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotat ions', 31 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotat ions',
31 ], 32 ],
32 # TODO(gregoryd): direct_dependent_settings should be shared with the 33 # TODO(gregoryd): direct_dependent_settings should be shared with the
33 # 64-bit target, but it doesn't work due to a bug in gyp 34 # 64-bit target, but it doesn't work due to a bug in gyp
34 'direct_dependent_settings': { 35 'direct_dependent_settings': {
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 ], 228 ],
228 }], 229 }],
229 ], 230 ],
230 }], 231 }],
231 ['OS=="ios"', { 232 ['OS=="ios"', {
232 'sources!': [ 233 'sources!': [
233 'sync_socket.h', 234 'sync_socket.h',
234 'sync_socket_posix.cc', 235 'sync_socket_posix.cc',
235 ] 236 ]
236 }], 237 }],
238 ['use_experimental_allocator_shim==1', {
239 'dependencies': [ 'allocator/allocator.gyp:unified_allocator_shim']
240 }],
237 ], 241 ],
238 'sources': [ 242 'sources': [
239 'auto_reset.h', 243 'auto_reset.h',
240 'linux_util.cc', 244 'linux_util.cc',
241 'linux_util.h', 245 'linux_util.h',
242 'message_loop/message_pump_android.cc', 246 'message_loop/message_pump_android.cc',
243 'message_loop/message_pump_android.h', 247 'message_loop/message_pump_android.h',
244 'message_loop/message_pump_glib.cc', 248 'message_loop/message_pump_glib.cc',
245 'message_loop/message_pump_glib.h', 249 'message_loop/message_pump_glib.h',
246 'message_loop/message_pump_io_ios.cc', 250 'message_loop/message_pump_io_ios.cc',
(...skipping 463 matching lines...) Expand 10 before | Expand all | Expand 10 after
710 'dependencies': [ 714 'dependencies': [
711 '../third_party/icu/icu.gyp:icudata', 715 '../third_party/icu/icu.gyp:icudata',
712 ], 716 ],
713 }], 717 }],
714 ], 718 ],
715 }, { # OS != "win" 719 }, { # OS != "win"
716 'dependencies': [ 720 'dependencies': [
717 'third_party/libevent/libevent.gyp:libevent' 721 'third_party/libevent/libevent.gyp:libevent'
718 ], 722 ],
719 }], 723 }],
724 ['use_experimental_allocator_shim==1', {
725 'sources': [ 'allocator/allocator_shim_unittest.cc']
726 }],
720 ], # conditions 727 ], # conditions
721 'target_conditions': [ 728 'target_conditions': [
722 ['OS == "ios" and _toolset != "host"', { 729 ['OS == "ios" and _toolset != "host"', {
723 'sources/': [ 730 'sources/': [
724 # Pull in specific Mac files for iOS (which have been filtered out 731 # Pull in specific Mac files for iOS (which have been filtered out
725 # by file name rules). 732 # by file name rules).
726 ['include', '^mac/bind_objc_block_unittest\\.mm$'], 733 ['include', '^mac/bind_objc_block_unittest\\.mm$'],
727 ['include', '^mac/foundation_util_unittest\\.mm$',], 734 ['include', '^mac/foundation_util_unittest\\.mm$',],
728 ['include', '^mac/objc_property_releaser_unittest\\.mm$'], 735 ['include', '^mac/objc_property_releaser_unittest\\.mm$'],
729 ['include', '^mac/scoped_nsobject_unittest\\.mm$'], 736 ['include', '^mac/scoped_nsobject_unittest\\.mm$'],
(...skipping 947 matching lines...) Expand 10 before | Expand all | Expand 10 after
1677 '../build/isolate.gypi', 1684 '../build/isolate.gypi',
1678 ], 1685 ],
1679 'sources': [ 1686 'sources': [
1680 'base_unittests.isolate', 1687 'base_unittests.isolate',
1681 ], 1688 ],
1682 }, 1689 },
1683 ], 1690 ],
1684 }], 1691 }],
1685 ], 1692 ],
1686 } 1693 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698