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

Side by Side Diff: base/base.gyp

Issue 7076026: Revert 86899 - Base: cleanup for base.dll. Move base_switches back to the (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'base.gypi', 10 'base.gypi',
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 'i18n/time_formatting.h', 55 'i18n/time_formatting.h',
56 ], 56 ],
57 }, 57 },
58 { 58 {
59 # This is the subset of files from base that should not be used with a 59 # This is the subset of files from base that should not be used with a
60 # dynamic library. Note that this library cannot depend on base because 60 # dynamic library. Note that this library cannot depend on base because
61 # base depends on base_static. 61 # base depends on base_static.
62 'target_name': 'base_static', 62 'target_name': 'base_static',
63 'type': 'static_library', 63 'type': 'static_library',
64 'sources': [ 64 'sources': [
65 'base_switches.cc',
66 'base_switches.h',
65 'win/pe_image.cc', 67 'win/pe_image.cc',
66 'win/pe_image.h', 68 'win/pe_image.h',
67 ], 69 ],
68 'include_dirs': [ 70 'include_dirs': [
69 '..', 71 '..',
70 ], 72 ],
71 }, 73 },
72 { 74 {
73 # TODO(rvargas): Remove this when gyp finally supports a clean model. 75 # TODO(rvargas): Remove this when gyp finally supports a clean model.
74 # See bug 36232. 76 # See bug 36232.
75 'target_name': 'base_static_win64', 77 'target_name': 'base_static_win64',
76 'type': 'static_library', 78 'type': 'static_library',
77 'sources': [ 79 'sources': [
80 'base_switches.cc',
81 'base_switches.h',
78 'win/pe_image.cc', 82 'win/pe_image.cc',
79 'win/pe_image.h', 83 'win/pe_image.h',
80 ], 84 ],
81 'include_dirs': [ 85 'include_dirs': [
82 '..', 86 '..',
83 ], 87 ],
84 'configurations': { 88 'configurations': {
85 'Common_Base': { 89 'Common_Base': {
86 'msvs_target_platform': 'x64', 90 'msvs_target_platform': 'x64',
87 }, 91 },
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 ], 380 ],
377 }], 381 }],
378 ], 382 ],
379 } 383 }
380 384
381 # Local Variables: 385 # Local Variables:
382 # tab-width:2 386 # tab-width:2
383 # indent-tabs-mode:nil 387 # indent-tabs-mode:nil
384 # End: 388 # End:
385 # vim: set expandtab tabstop=2 shiftwidth=2: 389 # vim: set expandtab tabstop=2 shiftwidth=2:
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