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

Side by Side Diff: chrome.gyp

Issue 444021: Remove lines missed by the r33241 merge to the 249 branch at r33243 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/249/src/chrome/
Patch Set: Created 11 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 'variables': { 9 'variables': {
10 'version_py_path': 'tools/build/version.py', 10 'version_py_path': 'tools/build/version.py',
(...skipping 6505 matching lines...) Expand 10 before | Expand all | Expand 10 after
6516 ], 6516 ],
6517 }], 6517 }],
6518 ['OS=="linux" and toolkit_views==0', { 6518 ['OS=="linux" and toolkit_views==0', {
6519 'sources': [ 6519 'sources': [
6520 '<@(browser_tests_sources_gtk_specific)', 6520 '<@(browser_tests_sources_gtk_specific)',
6521 ], 6521 ],
6522 }], 6522 }],
6523 ['OS=="mac"', { 6523 ['OS=="mac"', {
6524 'sources': [ 6524 'sources': [
6525 'app/breakpad_mac_stubs.mm', 6525 'app/breakpad_mac_stubs.mm',
6526 'app/keystone_glue.h',
6527 'app/keystone_glue.mm',
6528 ], 6526 ],
6529 'sources!': [ 6527 'sources!': [
6530 '<@(browser_tests_sources_exclude_on_mac)', 6528 '<@(browser_tests_sources_exclude_on_mac)',
6531 ], 6529 ],
6532 # TODO(mark): We really want this for all non-static library 6530 # TODO(mark): We really want this for all non-static library
6533 # targets, but when we tried to pull it up to the common.gypi 6531 # targets, but when we tried to pull it up to the common.gypi
6534 # level, it broke other things like the ui, startup, and 6532 # level, it broke other things like the ui, startup, and
6535 # page_cycler tests. *shrug* 6533 # page_cycler tests. *shrug*
6536 'xcode_settings': { 6534 'xcode_settings': {
6537 'OTHER_LDFLAGS': [ 6535 'OTHER_LDFLAGS': [
(...skipping 559 matching lines...) Expand 10 before | Expand all | Expand 10 after
7097 ] 7095 ]
7098 }], 7096 }],
7099 ], # 'conditions' 7097 ], # 'conditions'
7100 } 7098 }
7101 7099
7102 # Local Variables: 7100 # Local Variables:
7103 # tab-width:2 7101 # tab-width:2
7104 # indent-tabs-mode:nil 7102 # indent-tabs-mode:nil
7105 # End: 7103 # End:
7106 # vim: set expandtab tabstop=2 shiftwidth=2: 7104 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698