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

Side by Side Diff: base/base.gyp

Issue 14624010: Change MessagePumpLinux to MessagePumpOzone (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 728 matching lines...) Expand 10 before | Expand all | Expand 10 after
739 'dependencies': [ 739 'dependencies': [
740 '../build/linux/system.gyp:glib', 740 '../build/linux/system.gyp:glib',
741 '../build/linux/system.gyp:ssl', 741 '../build/linux/system.gyp:ssl',
742 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 742 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
743 ], 743 ],
744 }, { # use_glib!=1 744 }, { # use_glib!=1
745 'sources!': [ 745 'sources!': [
746 'message_pump_glib_unittest.cc', 746 'message_pump_glib_unittest.cc',
747 ] 747 ]
748 }], 748 }],
749 ['use_messagepump_linux == 1', { 749 ['use_ozone == 1', {
750 'sources!': [ 750 'sources!': [
751 'message_pump_glib_unittest.cc', 751 'message_pump_glib_unittest.cc',
752 ] 752 ]
753 }], 753 }],
754 # This is needed to trigger the dll copy step on windows. 754 # This is needed to trigger the dll copy step on windows.
755 # TODO(mark): This should not be necessary. 755 # TODO(mark): This should not be necessary.
756 ['OS == "win"', { 756 ['OS == "win"', {
757 'dependencies': [ 757 'dependencies': [
758 '../third_party/icu/icu.gyp:icudata', 758 '../third_party/icu/icu.gyp:icudata',
759 ], 759 ],
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
1230 'base_unittests.isolate', 1230 'base_unittests.isolate',
1231 ], 1231 ],
1232 'sources': [ 1232 'sources': [
1233 'base_unittests.isolate', 1233 'base_unittests.isolate',
1234 ], 1234 ],
1235 }, 1235 },
1236 ], 1236 ],
1237 }], 1237 }],
1238 ], 1238 ],
1239 } 1239 }
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