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

Side by Side Diff: Source/WebKit/chromium/WebKit.gyp

Issue 16881011: Remove WEBKIT_DLL and replace it with COMPONENT_BUILD (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: updates Created 7 years, 6 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
OLDNEW
1 # 1 #
2 # Copyright (C) 2011 Google Inc. All rights reserved. 2 # Copyright (C) 2011 Google Inc. All rights reserved.
3 # 3 #
4 # Redistribution and use in source and binary forms, with or without 4 # Redistribution and use in source and binary forms, with or without
5 # modification, are permitted provided that the following conditions are 5 # modification, are permitted provided that the following conditions are
6 # met: 6 # met:
7 # 7 #
8 # * Redistributions of source code must retain the above copyright 8 # * Redistributions of source code must retain the above copyright
9 # notice, this list of conditions and the following disclaimer. 9 # notice, this list of conditions and the following disclaimer.
10 # * Redistributions in binary form must reproduce the above 10 # * Redistributions in binary form must reproduce the above
(...skipping 538 matching lines...) Expand 10 before | Expand all | Expand 10 after
549 'src/WorkerFileSystemCallbacksBridge.h', 549 'src/WorkerFileSystemCallbacksBridge.h',
550 'src/WorkerFileWriterCallbacksBridge.cpp', 550 'src/WorkerFileWriterCallbacksBridge.cpp',
551 'src/WorkerFileWriterCallbacksBridge.h', 551 'src/WorkerFileWriterCallbacksBridge.h',
552 'src/WorkerStorageQuotaCallbacksBridge.cpp', 552 'src/WorkerStorageQuotaCallbacksBridge.cpp',
553 'src/WorkerStorageQuotaCallbacksBridge.h', 553 'src/WorkerStorageQuotaCallbacksBridge.h',
554 'src/win/WebInputEventFactory.cpp', 554 'src/win/WebInputEventFactory.cpp',
555 'src/win/WebScreenInfoFactory.cpp', 555 'src/win/WebScreenInfoFactory.cpp',
556 ], 556 ],
557 'conditions': [ 557 'conditions': [
558 ['component=="shared_library"', { 558 ['component=="shared_library"', {
559 'defines': [
560 'WEBKIT_DLL',
561 ],
562 'dependencies': [ 559 'dependencies': [
563 '../../core/core.gyp:webcore_derived', 560 '../../core/core.gyp:webcore_derived',
564 '../../core/core.gyp:webcore_test_support', 561 '../../core/core.gyp:webcore_test_support',
565 '<(DEPTH)/base/base.gyp:test_support_base', 562 '<(DEPTH)/base/base.gyp:test_support_base',
566 '<(DEPTH)/testing/gmock.gyp:gmock', 563 '<(DEPTH)/testing/gmock.gyp:gmock',
567 '<(DEPTH)/testing/gtest.gyp:gtest', 564 '<(DEPTH)/testing/gtest.gyp:gtest',
568 '<(DEPTH)/third_party/icu/icu.gyp:*', 565 '<(DEPTH)/third_party/icu/icu.gyp:*',
569 '<(DEPTH)/third_party/libjpeg_turbo/libjpeg.gyp:libjpeg' , 566 '<(DEPTH)/third_party/libjpeg_turbo/libjpeg.gyp:libjpeg' ,
570 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng', 567 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
571 '<(DEPTH)/third_party/libxml/libxml.gyp:libxml', 568 '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
572 '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt', 569 '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt',
573 '<(DEPTH)/third_party/modp_b64/modp_b64.gyp:modp_b64', 570 '<(DEPTH)/third_party/modp_b64/modp_b64.gyp:modp_b64',
574 '<(DEPTH)/third_party/ots/ots.gyp:ots', 571 '<(DEPTH)/third_party/ots/ots.gyp:ots',
575 '<(DEPTH)/third_party/zlib/zlib.gyp:zlib', 572 '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
576 '<(DEPTH)/url/url.gyp:url_lib', 573 '<(DEPTH)/url/url.gyp:url_lib',
577 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 574 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
578 # We must not add webkit_support here because of cyclic dependency. 575 # We must not add webkit_support here because of cyclic dependency.
579 ], 576 ],
580 'direct_dependent_settings': {
581 'defines': [
582 'WEBKIT_DLL',
583 ],
584 },
585 'export_dependent_settings': [ 577 'export_dependent_settings': [
586 '<(DEPTH)/url/url.gyp:url_lib', 578 '<(DEPTH)/url/url.gyp:url_lib',
587 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 579 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
588 ], 580 ],
589 'include_dirs': [ 581 'include_dirs': [
590 # WARNING: Do not view this particular case as a precede nt for 582 # WARNING: Do not view this particular case as a precede nt for
591 # including WebCore headers in DumpRenderTree project. 583 # including WebCore headers in DumpRenderTree project.
592 '../../core/testing/v8', # for WebCoreTestSupport.h, nee ded to link in window.internals code. 584 '../../core/testing/v8', # for WebCoreTestSupport.h, nee ded to link in window.internals code.
593 ], 585 ],
594 'sources': [ 586 'sources': [
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
794 ['clang==1', { 786 ['clang==1', {
795 'target_defaults': { 787 'target_defaults': {
796 'cflags': ['-Wglobal-constructors'], 788 'cflags': ['-Wglobal-constructors'],
797 'xcode_settings': { 789 'xcode_settings': {
798 'WARNING_CFLAGS': ['-Wglobal-constructors'], 790 'WARNING_CFLAGS': ['-Wglobal-constructors'],
799 }, 791 },
800 }, 792 },
801 }], 793 }],
802 ], # conditions 794 ], # conditions
803 } 795 }
OLDNEW
« no previous file with comments | « no previous file | Source/WebKit/chromium/WebKitUnitTests.gyp » ('j') | Source/WebKit/chromium/WebKitUnitTests.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698