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

Side by Side Diff: build/all.gyp

Issue 2885005: Move chrome/common/net/notifier to jingle/notifier so that it can be used by remoting/remoting.gyp. (Closed) Base URL: git://codf21.jail.google.com/chromium.git
Patch Set: rebased Created 10 years, 5 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
« no previous file with comments | « no previous file | chrome/browser/sync/DEPS » ('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) 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 '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,
11 'dependencies': [ 11 'dependencies': [
12 '../app/app.gyp:*', 12 '../app/app.gyp:*',
13 '../base/base.gyp:*', 13 '../base/base.gyp:*',
14 '../chrome/browser/sync/tools/sync_tools.gyp:*', 14 '../chrome/browser/sync/tools/sync_tools.gyp:*',
15 '../chrome/chrome.gyp:*', 15 '../chrome/chrome.gyp:*',
16 '../gfx/gfx.gyp:*', 16 '../gfx/gfx.gyp:*',
17 '../gpu/gpu.gyp:*', 17 '../gpu/gpu.gyp:*',
18 '../gpu/demos/demos.gyp:*', 18 '../gpu/demos/demos.gyp:*',
19 '../ipc/ipc.gyp:*', 19 '../ipc/ipc.gyp:*',
20 '../jingle/jingle.gyp:*',
20 '../media/media.gyp:*', 21 '../media/media.gyp:*',
21 '../net/net.gyp:*', 22 '../net/net.gyp:*',
22 '../net/third_party/nss/ssl.gyp:*', 23 '../net/third_party/nss/ssl.gyp:*',
23 '../printing/printing.gyp:*', 24 '../printing/printing.gyp:*',
24 '../sdch/sdch.gyp:*', 25 '../sdch/sdch.gyp:*',
25 '../skia/skia.gyp:*', 26 '../skia/skia.gyp:*',
26 '../testing/gmock.gyp:*', 27 '../testing/gmock.gyp:*',
27 '../testing/gtest.gyp:*', 28 '../testing/gtest.gyp:*',
28 '../third_party/bzip2/bzip2.gyp:*', 29 '../third_party/bzip2/bzip2.gyp:*',
29 '../third_party/cacheinvalidation/cacheinvalidation.gyp:*', 30 '../third_party/cacheinvalidation/cacheinvalidation.gyp:*',
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 '../chrome/chrome.gyp:build_app_dmg', 147 '../chrome/chrome.gyp:build_app_dmg',
147 ], 148 ],
148 }, 149 },
149 # These targets are here so the build bots can use them to build 150 # These targets are here so the build bots can use them to build
150 # subsets of a full tree for faster cycle times. 151 # subsets of a full tree for faster cycle times.
151 { 152 {
152 'target_name': 'chromium_builder_dbg', 153 'target_name': 'chromium_builder_dbg',
153 'type': 'none', 154 'type': 'none',
154 'dependencies': [ 155 'dependencies': [
155 '../app/app.gyp:app_unittests', 156 '../app/app.gyp:app_unittests',
157 '../chrome/chrome.gyp:browser_tests',
158 '../chrome/chrome.gyp:nacl_ui_tests',
159 '../chrome/chrome.gyp:sync_unit_tests',
160 '../chrome/chrome.gyp:ui_tests',
161 '../chrome/chrome.gyp:unit_tests',
156 '../gfx/gfx.gyp:gfx_unittests', 162 '../gfx/gfx.gyp:gfx_unittests',
157 '../gpu/gpu.gyp:gpu_unittests', 163 '../gpu/gpu.gyp:gpu_unittests',
158 '../ipc/ipc.gyp:ipc_tests', 164 '../ipc/ipc.gyp:ipc_tests',
165 '../jingle/jingle.gyp:notifier_unit_tests',
159 '../media/media.gyp:media_unittests', 166 '../media/media.gyp:media_unittests',
160 '../printing/printing.gyp:printing_unittests', 167 '../printing/printing.gyp:printing_unittests',
161 '../remoting/remoting.gyp:remoting_unittests', 168 '../remoting/remoting.gyp:remoting_unittests',
162 '../chrome/chrome.gyp:browser_tests',
163 '../chrome/chrome.gyp:nacl_ui_tests',
164 '../chrome/chrome.gyp:notifier_unit_tests',
165 '../chrome/chrome.gyp:sync_unit_tests',
166 '../chrome/chrome.gyp:ui_tests',
167 '../chrome/chrome.gyp:unit_tests',
168 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_unittests', 169 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_unittests',
169 'temp_gyp/googleurl.gyp:googleurl_unittests', 170 'temp_gyp/googleurl.gyp:googleurl_unittests',
170 ], 171 ],
171 }, 172 },
172 { 173 {
173 'target_name': 'chromium_builder_rel', 174 'target_name': 'chromium_builder_rel',
174 'type': 'none', 175 'type': 'none',
175 'dependencies': [ 176 'dependencies': [
176 '../app/app.gyp:app_unittests', 177 '../app/app.gyp:app_unittests',
177 '../chrome/chrome.gyp:browser_tests', 178 '../chrome/chrome.gyp:browser_tests',
178 '../chrome/chrome.gyp:memory_test', 179 '../chrome/chrome.gyp:memory_test',
179 '../chrome/chrome.gyp:nacl_ui_tests', 180 '../chrome/chrome.gyp:nacl_ui_tests',
180 '../chrome/chrome.gyp:notifier_unit_tests',
181 '../chrome/chrome.gyp:page_cycler_tests', 181 '../chrome/chrome.gyp:page_cycler_tests',
182 '../chrome/chrome.gyp:plugin_tests', 182 '../chrome/chrome.gyp:plugin_tests',
183 '../chrome/chrome.gyp:startup_tests', 183 '../chrome/chrome.gyp:startup_tests',
184 '../chrome/chrome.gyp:sync_unit_tests', 184 '../chrome/chrome.gyp:sync_unit_tests',
185 '../chrome/chrome.gyp:tab_switching_test', 185 '../chrome/chrome.gyp:tab_switching_test',
186 '../chrome/chrome.gyp:ui_tests', 186 '../chrome/chrome.gyp:ui_tests',
187 '../chrome/chrome.gyp:unit_tests', 187 '../chrome/chrome.gyp:unit_tests',
188 '../chrome/chrome.gyp:url_fetch_test', 188 '../chrome/chrome.gyp:url_fetch_test',
189 '../gfx/gfx.gyp:gfx_unittests', 189 '../gfx/gfx.gyp:gfx_unittests',
190 '../gpu/gpu.gyp:gpu_unittests', 190 '../gpu/gpu.gyp:gpu_unittests',
191 '../ipc/ipc.gyp:ipc_tests', 191 '../ipc/ipc.gyp:ipc_tests',
192 '../jingle/jingle.gyp:notifier_unit_tests',
192 '../media/media.gyp:media_unittests', 193 '../media/media.gyp:media_unittests',
193 '../printing/printing.gyp:printing_unittests', 194 '../printing/printing.gyp:printing_unittests',
194 '../remoting/remoting.gyp:remoting_unittests', 195 '../remoting/remoting.gyp:remoting_unittests',
195 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_unittests', 196 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_unittests',
196 'temp_gyp/googleurl.gyp:googleurl_unittests', 197 'temp_gyp/googleurl.gyp:googleurl_unittests',
197 ], 198 ],
198 }, 199 },
199 { 200 {
200 'target_name': 'chromium_builder_dbg_tsan_mac', 201 'target_name': 'chromium_builder_dbg_tsan_mac',
201 'type': 'none', 202 'type': 'none',
202 'dependencies': [ 203 'dependencies': [
203 '../base/base.gyp:base_unittests', 204 '../base/base.gyp:base_unittests',
204 'temp_gyp/googleurl.gyp:googleurl_unittests', 205 'temp_gyp/googleurl.gyp:googleurl_unittests',
205 '../chrome/chrome.gyp:notifier_unit_tests',
206 '../net/net.gyp:net_unittests', 206 '../net/net.gyp:net_unittests',
207 '../ipc/ipc.gyp:ipc_tests', 207 '../ipc/ipc.gyp:ipc_tests',
208 '../jingle/jingle.gyp:notifier_unit_tests',
208 '../media/media.gyp:media_unittests', 209 '../media/media.gyp:media_unittests',
209 '../printing/printing.gyp:printing_unittests', 210 '../printing/printing.gyp:printing_unittests',
210 '../remoting/remoting.gyp:remoting_unittests', 211 '../remoting/remoting.gyp:remoting_unittests',
211 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_unittests', 212 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_unittests',
212 ], 213 ],
213 }, 214 },
214 ], # targets 215 ], # targets
215 }], # OS="mac" 216 }], # OS="mac"
216 ['OS=="win"', { 217 ['OS=="win"', {
217 'targets': [ 218 'targets': [
218 # These targets are here so the build bots can use them to build 219 # These targets are here so the build bots can use them to build
219 # subsets of a full tree for faster cycle times. 220 # subsets of a full tree for faster cycle times.
220 { 221 {
221 'target_name': 'chromium_builder', 222 'target_name': 'chromium_builder',
222 'type': 'none', 223 'type': 'none',
223 'dependencies': [ 224 'dependencies': [
224 '../app/app.gyp:app_unittests', 225 '../app/app.gyp:app_unittests',
225 '../chrome/chrome.gyp:browser_tests', 226 '../chrome/chrome.gyp:browser_tests',
226 '../chrome/chrome.gyp:installer_util_unittests', 227 '../chrome/chrome.gyp:installer_util_unittests',
227 '../chrome/chrome.gyp:interactive_ui_tests', 228 '../chrome/chrome.gyp:interactive_ui_tests',
228 '../chrome/chrome.gyp:memory_test', 229 '../chrome/chrome.gyp:memory_test',
229 '../chrome/chrome.gyp:mini_installer_test', 230 '../chrome/chrome.gyp:mini_installer_test',
230 '../chrome/chrome.gyp:nacl_ui_tests', 231 '../chrome/chrome.gyp:nacl_ui_tests',
231 '../chrome/chrome.gyp:notifier_unit_tests',
232 '../chrome/chrome.gyp:page_cycler_tests', 232 '../chrome/chrome.gyp:page_cycler_tests',
233 '../chrome/chrome.gyp:plugin_tests', 233 '../chrome/chrome.gyp:plugin_tests',
234 '../chrome/chrome.gyp:selenium_tests', 234 '../chrome/chrome.gyp:selenium_tests',
235 '../chrome/chrome.gyp:startup_tests', 235 '../chrome/chrome.gyp:startup_tests',
236 '../chrome/chrome.gyp:sync_unit_tests', 236 '../chrome/chrome.gyp:sync_unit_tests',
237 '../chrome/chrome.gyp:tab_switching_test', 237 '../chrome/chrome.gyp:tab_switching_test',
238 '../chrome/chrome.gyp:ui_tests', 238 '../chrome/chrome.gyp:ui_tests',
239 '../chrome/chrome.gyp:unit_tests', 239 '../chrome/chrome.gyp:unit_tests',
240 '../chrome/chrome.gyp:url_fetch_test', 240 '../chrome/chrome.gyp:url_fetch_test',
241 # mini_installer_tests depends on mini_installer. This should be 241 # mini_installer_tests depends on mini_installer. This should be
242 # defined in installer.gyp. 242 # defined in installer.gyp.
243 '../chrome/installer/mini_installer.gyp:mini_installer', 243 '../chrome/installer/mini_installer.gyp:mini_installer',
244 '../chrome/installer/mini_installer.gyp:chrome_frame_mini_installer' , 244 '../chrome/installer/mini_installer.gyp:chrome_frame_mini_installer' ,
245 '../courgette/courgette.gyp:courgette_unittests', 245 '../courgette/courgette.gyp:courgette_unittests',
246 '../gfx/gfx.gyp:gfx_unittests', 246 '../gfx/gfx.gyp:gfx_unittests',
247 '../gpu/gpu.gyp:gpu_unittests', 247 '../gpu/gpu.gyp:gpu_unittests',
248 '../ipc/ipc.gyp:ipc_tests', 248 '../ipc/ipc.gyp:ipc_tests',
249 '../jingle/jingle.gyp:notifier_unit_tests',
249 '../media/media.gyp:media_unittests', 250 '../media/media.gyp:media_unittests',
250 '../printing/printing.gyp:printing_unittests', 251 '../printing/printing.gyp:printing_unittests',
251 '../remoting/remoting.gyp:remoting_unittests', 252 '../remoting/remoting.gyp:remoting_unittests',
252 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_unittests', 253 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_unittests',
253 '../webkit/support/webkit_support.gyp:npapi_layout_test_plugin', 254 '../webkit/support/webkit_support.gyp:npapi_layout_test_plugin',
254 # TODO(nsylvain) ui_tests.exe depends on test_shell_common. 255 # TODO(nsylvain) ui_tests.exe depends on test_shell_common.
255 # This should: 256 # This should:
256 # 1) not be the case. OR. 257 # 1) not be the case. OR.
257 # 2) be expressed in the ui tests dependencies. 258 # 2) be expressed in the ui tests dependencies.
258 '../webkit/webkit.gyp:test_shell_common', 259 '../webkit/webkit.gyp:test_shell_common',
(...skipping 11 matching lines...) Expand all
270 ], 271 ],
271 }, 272 },
272 { 273 {
273 'target_name': 'chromium_builder_dbg_tsan_win', 274 'target_name': 'chromium_builder_dbg_tsan_win',
274 'type': 'none', 275 'type': 'none',
275 'dependencies': [ 276 'dependencies': [
276 '../app/app.gyp:app_unittests', 277 '../app/app.gyp:app_unittests',
277 # TODO(bradnelson): app_unittests should depend on locales. 278 # TODO(bradnelson): app_unittests should depend on locales.
278 # However, we can't add dependencies on chrome/ to app/ 279 # However, we can't add dependencies on chrome/ to app/
279 # See http://crbug.com/43603 280 # See http://crbug.com/43603
281 '../base/base.gyp:base_unittests',
280 '../chrome/app/locales/locales.gyp:*', 282 '../chrome/app/locales/locales.gyp:*',
281 '../base/base.gyp:base_unittests', 283 '../chrome/chrome.gyp:sync_unit_tests',
282 'temp_gyp/googleurl.gyp:googleurl_unittests', 284 '../chrome/chrome.gyp:unit_tests',
285 '../ipc/ipc.gyp:ipc_tests',
286 '../jingle/jingle.gyp:notifier_unit_tests',
287 '../media/media.gyp:media_unittests',
283 '../net/net.gyp:net_unittests', 288 '../net/net.gyp:net_unittests',
284 '../ipc/ipc.gyp:ipc_tests',
285 '../media/media.gyp:media_unittests',
286 '../printing/printing.gyp:printing_unittests', 289 '../printing/printing.gyp:printing_unittests',
287 '../remoting/remoting.gyp:remoting_unittests', 290 '../remoting/remoting.gyp:remoting_unittests',
288 '../chrome/chrome.gyp:notifier_unit_tests',
289 '../chrome/chrome.gyp:sync_unit_tests',
290 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_unittests', 291 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_unittests',
291 '../chrome/chrome.gyp:unit_tests', 292 'temp_gyp/googleurl.gyp:googleurl_unittests',
292 ], 293 ],
293 }, 294 },
294 ], # targets 295 ], # targets
295 }], # OS="win" 296 }], # OS="win"
296 ['chromeos==1', { 297 ['chromeos==1', {
297 'targets': [ 298 'targets': [
298 { 299 {
299 'target_name': 'chromeos_builder', 300 'target_name': 'chromeos_builder',
300 'type': 'none', 301 'type': 'none',
301 'sources': [ 302 'sources': [
302 # TODO(bradnelson): This is here to work around gyp issue 137. 303 # TODO(bradnelson): This is here to work around gyp issue 137.
303 # Remove this sources list when that issue has been fixed. 304 # Remove this sources list when that issue has been fixed.
304 'all.gyp', 305 'all.gyp',
305 ], 306 ],
306 'dependencies': [ 307 'dependencies': [
307 '../app/app.gyp:app_unittests', 308 '../app/app.gyp:app_unittests',
308 '../base/base.gyp:base_unittests', 309 '../base/base.gyp:base_unittests',
309 '../chrome/chrome.gyp:browser_tests', 310 '../chrome/chrome.gyp:browser_tests',
310 '../chrome/chrome.gyp:chrome', 311 '../chrome/chrome.gyp:chrome',
311 '../chrome/chrome.gyp:interactive_ui_tests', 312 '../chrome/chrome.gyp:interactive_ui_tests',
312 '../chrome/chrome.gyp:memory_test', 313 '../chrome/chrome.gyp:memory_test',
313 '../chrome/chrome.gyp:notifier_unit_tests',
314 '../chrome/chrome.gyp:page_cycler_tests', 314 '../chrome/chrome.gyp:page_cycler_tests',
315 '../chrome/chrome.gyp:startup_tests', 315 '../chrome/chrome.gyp:startup_tests',
316 '../chrome/chrome.gyp:sync_unit_tests', 316 '../chrome/chrome.gyp:sync_unit_tests',
317 '../chrome/chrome.gyp:tab_switching_test', 317 '../chrome/chrome.gyp:tab_switching_test',
318 '../chrome/chrome.gyp:ui_tests', 318 '../chrome/chrome.gyp:ui_tests',
319 '../chrome/chrome.gyp:unit_tests', 319 '../chrome/chrome.gyp:unit_tests',
320 '../chrome/chrome.gyp:url_fetch_test', 320 '../chrome/chrome.gyp:url_fetch_test',
321 '../gfx/gfx.gyp:gfx_unittests', 321 '../gfx/gfx.gyp:gfx_unittests',
322 '../ipc/ipc.gyp:ipc_tests', 322 '../ipc/ipc.gyp:ipc_tests',
323 '../jingle/jingle.gyp:notifier_unit_tests',
323 '../media/media.gyp:ffmpeg_tests', 324 '../media/media.gyp:ffmpeg_tests',
324 '../media/media.gyp:media_unittests', 325 '../media/media.gyp:media_unittests',
325 '../media/media.gyp:omx_test', 326 '../media/media.gyp:omx_test',
326 '../net/net.gyp:net_unittests', 327 '../net/net.gyp:net_unittests',
327 '../printing/printing.gyp:printing_unittests', 328 '../printing/printing.gyp:printing_unittests',
328 '../remoting/remoting.gyp:remoting_unittests', 329 '../remoting/remoting.gyp:remoting_unittests',
329 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_unittests', 330 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid ation_unittests',
330 'temp_gyp/googleurl.gyp:googleurl_unittests', 331 'temp_gyp/googleurl.gyp:googleurl_unittests',
331 '../chrome/browser/chromeos/input_method/candidate_window.gyp:candid ate_window', 332 '../chrome/browser/chromeos/input_method/candidate_window.gyp:candid ate_window',
332 ], 333 ],
333 }, 334 },
334 ], # targets 335 ], # targets
335 }], # "chromeos==1" 336 }], # "chromeos==1"
336 ], # conditions 337 ], # conditions
337 } 338 }
338 339
339 # Local Variables: 340 # Local Variables:
340 # tab-width:2 341 # tab-width:2
341 # indent-tabs-mode:nil 342 # indent-tabs-mode:nil
342 # End: 343 # End:
343 # vim: set expandtab tabstop=2 shiftwidth=2: 344 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/sync/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698