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

Side by Side Diff: build/all.gyp

Issue 11148035: Add CrOS's dbus-c++ to Chromium Linux. This is needed to build mtpd. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: add missing define Created 8 years, 2 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 | « DEPS ('k') | third_party/cros_dbus_cplusplus/README.chromium » ('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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'All', 8 'target_name': 'All',
9 'type': 'none', 9 'type': 'none',
10 'xcode_create_dependents_test_runner': 1, 10 'xcode_create_dependents_test_runner': 1,
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 '../courgette/courgette.gyp:*', 90 '../courgette/courgette.gyp:*',
91 '../dbus/dbus.gyp:*', 91 '../dbus/dbus.gyp:*',
92 '../sandbox/sandbox.gyp:*', 92 '../sandbox/sandbox.gyp:*',
93 ], 93 ],
94 'conditions': [ 94 'conditions': [
95 ['branding=="Chrome"', { 95 ['branding=="Chrome"', {
96 'dependencies': [ 96 'dependencies': [
97 '../chrome/chrome.gyp:linux_packages_<(channel)', 97 '../chrome/chrome.gyp:linux_packages_<(channel)',
98 ], 98 ],
99 }], 99 }],
100 ['chromeos==0', {
101 'dependencies': [
102 '../third_party/cros_dbus_cplusplus/cros_dbus_cplusplus.gyp:*',
103 ],
104 }],
100 ], 105 ],
101 }], 106 }],
102 ['toolkit_uses_gtk==1', { 107 ['toolkit_uses_gtk==1', {
103 'dependencies': [ 108 'dependencies': [
104 '../tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp:*', 109 '../tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp:*',
105 '../tools/xdisplaycheck/xdisplaycheck.gyp:*', 110 '../tools/xdisplaycheck/xdisplaycheck.gyp:*',
106 ], 111 ],
107 }], 112 }],
108 ['OS=="win"', { 113 ['OS=="win"', {
109 'conditions': [ 114 'conditions': [
(...skipping 592 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 '../base/base.gyp:base_unittests_run', 707 '../base/base.gyp:base_unittests_run',
703 '../chrome/chrome.gyp:browser_tests_run', 708 '../chrome/chrome.gyp:browser_tests_run',
704 '../chrome/chrome.gyp:unit_tests_run', 709 '../chrome/chrome.gyp:unit_tests_run',
705 '../net/net.gyp:net_unittests_run', 710 '../net/net.gyp:net_unittests_run',
706 ], 711 ],
707 }, # target_name: chromium_swarm_tests 712 }, # target_name: chromium_swarm_tests
708 ], 713 ],
709 }], 714 }],
710 ], # conditions 715 ], # conditions
711 } 716 }
OLDNEW
« no previous file with comments | « DEPS ('k') | third_party/cros_dbus_cplusplus/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698