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

Side by Side Diff: base/base.gyp

Issue 1487403002: Remove allocator_extension_thunks since this layer is not required (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove NULL Created 5 years 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 'base_static', 24 'base_static',
25 'allocator/allocator.gyp:allocator_extension_thunks',
26 '../testing/gtest.gyp:gtest_prod', 25 '../testing/gtest.gyp:gtest_prod',
27 '../third_party/modp_b64/modp_b64.gyp:modp_b64', 26 '../third_party/modp_b64/modp_b64.gyp:modp_b64',
28 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotat ions', 27 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotat ions',
29 ], 28 ],
30 # TODO(gregoryd): direct_dependent_settings should be shared with the 29 # TODO(gregoryd): direct_dependent_settings should be shared with the
31 # 64-bit target, but it doesn't work due to a bug in gyp 30 # 64-bit target, but it doesn't work due to a bug in gyp
32 'direct_dependent_settings': { 31 'direct_dependent_settings': {
33 'include_dirs': [ 32 'include_dirs': [
34 '..', 33 '..',
35 ], 34 ],
(...skipping 1089 matching lines...) Expand 10 before | Expand all | Expand 10 after
1125 # The base_win64 target here allows us to use base for Win64 targets 1124 # The base_win64 target here allows us to use base for Win64 targets
1126 # (the normal build is 32 bits). 1125 # (the normal build is 32 bits).
1127 { 1126 {
1128 'target_name': 'base_win64', 1127 'target_name': 'base_win64',
1129 'type': '<(component)', 1128 'type': '<(component)',
1130 'variables': { 1129 'variables': {
1131 'base_target': 1, 1130 'base_target': 1,
1132 }, 1131 },
1133 'dependencies': [ 1132 'dependencies': [
1134 'base_static_win64', 1133 'base_static_win64',
1135 'allocator/allocator.gyp:allocator_extension_thunks_win64',
1136 '../third_party/modp_b64/modp_b64.gyp:modp_b64_win64', 1134 '../third_party/modp_b64/modp_b64.gyp:modp_b64_win64',
1137 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_ann otations_win64', 1135 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_ann otations_win64',
1138 'trace_event/etw_manifest/etw_manifest.gyp:etw_manifest', 1136 'trace_event/etw_manifest/etw_manifest.gyp:etw_manifest',
1139 ], 1137 ],
1140 # TODO(gregoryd): direct_dependent_settings should be shared with the 1138 # TODO(gregoryd): direct_dependent_settings should be shared with the
1141 # 32-bit target, but it doesn't work due to a bug in gyp 1139 # 32-bit target, but it doesn't work due to a bug in gyp
1142 'direct_dependent_settings': { 1140 'direct_dependent_settings': {
1143 'include_dirs': [ 1141 'include_dirs': [
1144 '..', 1142 '..',
1145 ], 1143 ],
(...skipping 569 matching lines...) Expand 10 before | Expand all | Expand 10 after
1715 '../build/isolate.gypi', 1713 '../build/isolate.gypi',
1716 ], 1714 ],
1717 'sources': [ 1715 'sources': [
1718 'base_unittests.isolate', 1716 'base_unittests.isolate',
1719 ], 1717 ],
1720 }, 1718 },
1721 ], 1719 ],
1722 }], 1720 }],
1723 ], 1721 ],
1724 } 1722 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698