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

Side by Side Diff: base/base.gyp

Issue 42340: Update the gyp Linux build: (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 9 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') | build/common.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) 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 'includes': [ 9 'includes': [
10 '../build/common.gypi', 10 '../build/common.gypi',
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 'conditions': [ 312 'conditions': [
313 [ 'OS == "linux"', { 313 [ 'OS == "linux"', {
314 'sources/': [ ['exclude', '_(mac|win)\\.cc$'], 314 'sources/': [ ['exclude', '_(mac|win)\\.cc$'],
315 ['exclude', '\\.mm?$' ] ], 315 ['exclude', '\\.mm?$' ] ],
316 'sources!': [ 316 'sources!': [
317 # Linux has an implementation of idle_timer that depends 317 # Linux has an implementation of idle_timer that depends
318 # on XScreenSaver, but it's unclear if we want it yet, 318 # on XScreenSaver, but it's unclear if we want it yet,
319 # so use idle_timer_none.cc instead. 319 # so use idle_timer_none.cc instead.
320 'idle_timer.cc', 320 'idle_timer.cc',
321 ], 321 ],
322 'cflags': ['-Wno-write-strings'], 322 'dependencies': [
323 '../build/linux/system.gyp:gtk',
324 '../build/linux/system.gyp:nss',
325 ],
326 'cflags': [
327 '-Wno-write-strings',
328 ],
329 'link_settings': {
330 'libraries': [
331 # We need rt for clock_gettime().
332 '-lrt',
333 ],
334 },
323 }, 335 },
324 { # else: OS != "linux" 336 { # else: OS != "linux"
325 'sources!': [ 337 'sources!': [
326 'atomicops_internals_x86_gcc.cc', 338 'atomicops_internals_x86_gcc.cc',
327 'directory_watcher_inotify.cc', 339 'directory_watcher_inotify.cc',
328 'hmac_nss.cc', 340 'hmac_nss.cc',
329 'idle_timer_none.cc', 341 'idle_timer_none.cc',
330 'message_pump_glib.cc', 342 'message_pump_glib.cc',
331 'nss_init.cc', 343 'nss_init.cc',
332 'time_posix.cc', 344 'time_posix.cc',
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 'base', 441 'base',
430 '../skia/skia.gyp:skia', 442 '../skia/skia.gyp:skia',
431 '../third_party/libjpeg/libjpeg.gyp:libjpeg', 443 '../third_party/libjpeg/libjpeg.gyp:libjpeg',
432 '../third_party/libpng/libpng.gyp:libpng', 444 '../third_party/libpng/libpng.gyp:libpng',
433 '../third_party/zlib/zlib.gyp:zlib', 445 '../third_party/zlib/zlib.gyp:zlib',
434 ], 446 ],
435 'export_dependent_settings': [ 447 'export_dependent_settings': [
436 'base', 448 'base',
437 ], 449 ],
438 'conditions': [ 450 'conditions': [
451 ['OS == "linux"', {
452 'dependencies': [
453 '../build/linux/system.gyp:gtk',
454 ],
455 }],
439 [ 'OS != "win"', { 'sources!': [ 456 [ 'OS != "win"', { 'sources!': [
440 'gfx/gdi_util.cc', 457 'gfx/gdi_util.cc',
441 'gfx/native_theme.cc', 458 'gfx/native_theme.cc',
442 ], 459 ],
443 }], 460 }],
444 [ 'OS != "linux"', { 'sources!': [ 461 [ 'OS != "linux"', { 'sources!': [
445 'gfx/gtk_util.cc', 462 'gfx/gtk_util.cc',
446 ], 463 ],
447 }], 464 }],
448 ], 465 ],
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
535 '../testing/gtest.gyp:gtest', 552 '../testing/gtest.gyp:gtest',
536 ], 553 ],
537 'conditions': [ 554 'conditions': [
538 ['OS == "linux"', { 555 ['OS == "linux"', {
539 'sources!': [ 556 'sources!': [
540 'file_version_info_unittest.cc', 557 'file_version_info_unittest.cc',
541 # Linux has an implementation of idle_timer, but it's unclear 558 # Linux has an implementation of idle_timer, but it's unclear
542 # if we want it yet, so leave it 'unported' for now. 559 # if we want it yet, so leave it 'unported' for now.
543 'idletimer_unittest.cc', 560 'idletimer_unittest.cc',
544 ], 561 ],
562 'dependencies': [
563 '../build/linux/system.gyp:gtk',
564 ],
545 }], 565 }],
546 ['OS != "mac"', { 566 ['OS != "mac"', {
547 'sources!': [ 567 'sources!': [
548 'mac_util_unittest.cc', 568 'mac_util_unittest.cc',
549 ], 569 ],
550 }], 570 }],
551 # This is needed to trigger the dll copy step on windows. 571 # This is needed to trigger the dll copy step on windows.
552 # TODO(mark): This should not be necessary. 572 # TODO(mark): This should not be necessary.
553 ['OS == "win"', { 573 ['OS == "win"', {
554 'dependencies': [ 574 'dependencies': [
(...skipping 28 matching lines...) Expand all
583 ], 603 ],
584 'sources': [ 604 'sources': [
585 'perftimer.cc', 605 'perftimer.cc',
586 'run_all_perftests.cc', 606 'run_all_perftests.cc',
587 ], 607 ],
588 'direct_dependent_settings': { 608 'direct_dependent_settings': {
589 'defines': [ 609 'defines': [
590 'PERF_TEST', 610 'PERF_TEST',
591 ], 611 ],
592 }, 612 },
613 'conditions': [
614 ['OS == "linux"', {
615 'dependencies': [
616 # Needed to handle the #include chain:
617 # base/perf_test_suite.h
618 # base/test_suite.h
619 # gtk/gtk.h
620 '../build/linux/system.gyp:gtk',
621 ],
622 }],
623 ],
593 }, 624 },
594 ], 625 ],
595 'conditions': [ 626 'conditions': [
596 [ 'OS == "win"', { 627 [ 'OS == "win"', {
597 'targets': [ 628 'targets': [
598 { 629 {
599 'target_name': 'debug_message', 630 'target_name': 'debug_message',
600 'type': 'executable', 631 'type': 'executable',
601 'sources': [ 632 'sources': [
602 'debug_message.cc', 633 'debug_message.cc',
603 ], 634 ],
604 }, 635 },
605 ], 636 ],
606 }], 637 }],
607 ], 638 ],
608 } 639 }
OLDNEW
« no previous file with comments | « DEPS ('k') | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698