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

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

Issue 16357021: Move core.gyp up one directory to Source/core/ (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Patch for landing 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
« no previous file with comments | « no previous file | Source/WebKit/chromium/WebKitUnitTests.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 24 matching lines...) Expand all
35 '../../core/core.gypi', 35 '../../core/core.gypi',
36 'WebKit.gypi', 36 'WebKit.gypi',
37 '../../core/features.gypi', 37 '../../core/features.gypi',
38 ], 38 ],
39 'targets': [ 39 'targets': [
40 { 40 {
41 'target_name': 'webkit', 41 'target_name': 'webkit',
42 'type': '<(component)', 42 'type': '<(component)',
43 'variables': { 'enable_wexit_time_destructors': 1, }, 43 'variables': { 'enable_wexit_time_destructors': 1, },
44 'dependencies': [ 44 'dependencies': [
45 '../../core/core.gyp/core.gyp:webcore', 45 '../../core/core_tmp.gyp:webcore',
46 '../../modules/modules.gyp:modules', 46 '../../modules/modules.gyp:modules',
47 '<(DEPTH)/skia/skia.gyp:skia', 47 '<(DEPTH)/skia/skia.gyp:skia',
48 '<(DEPTH)/third_party/angle/src/build_angle.gyp:translator_glsl' , 48 '<(DEPTH)/third_party/angle/src/build_angle.gyp:translator_glsl' ,
49 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', 49 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
50 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', 50 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
51 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 51 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
52 ], 52 ],
53 'export_dependent_settings': [ 53 'export_dependent_settings': [
54 '<(DEPTH)/skia/skia.gyp:skia', 54 '<(DEPTH)/skia/skia.gyp:skia',
55 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', 55 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
(...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after
557 'src/win/WebInputEventFactory.cpp', 557 'src/win/WebInputEventFactory.cpp',
558 'src/win/WebScreenInfoFactory.cpp', 558 'src/win/WebScreenInfoFactory.cpp',
559 ], 559 ],
560 'conditions': [ 560 'conditions': [
561 ['component=="shared_library"', { 561 ['component=="shared_library"', {
562 'defines': [ 562 'defines': [
563 'WEBKIT_DLL', 563 'WEBKIT_DLL',
564 'WEBKIT_IMPLEMENTATION=1', 564 'WEBKIT_IMPLEMENTATION=1',
565 ], 565 ],
566 'dependencies': [ 566 'dependencies': [
567 '../../core/core.gyp/core.gyp:webcore_derived', 567 '../../core/core_tmp.gyp:webcore_derived',
568 '../../core/core.gyp/core.gyp:webcore_test_support', 568 '../../core/core_tmp.gyp:webcore_test_support',
569 '<(DEPTH)/base/base.gyp:test_support_base', 569 '<(DEPTH)/base/base.gyp:test_support_base',
570 '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl', 570 '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
571 '<(DEPTH)/testing/gtest.gyp:gtest', 571 '<(DEPTH)/testing/gtest.gyp:gtest',
572 '<(DEPTH)/testing/gmock.gyp:gmock', 572 '<(DEPTH)/testing/gmock.gyp:gmock',
573 '<(DEPTH)/third_party/icu/icu.gyp:*', 573 '<(DEPTH)/third_party/icu/icu.gyp:*',
574 '<(DEPTH)/third_party/libjpeg_turbo/libjpeg.gyp:libjpeg' , 574 '<(DEPTH)/third_party/libjpeg_turbo/libjpeg.gyp:libjpeg' ,
575 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng', 575 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
576 '<(DEPTH)/third_party/libxml/libxml.gyp:libxml', 576 '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
577 '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt', 577 '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt',
578 '<(DEPTH)/third_party/modp_b64/modp_b64.gyp:modp_b64', 578 '<(DEPTH)/third_party/modp_b64/modp_b64.gyp:modp_b64',
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
737 }, 737 },
738 { 738 {
739 'target_name': 'webkit_test_support', 739 'target_name': 'webkit_test_support',
740 'conditions': [ 740 'conditions': [
741 ['component=="shared_library"', { 741 ['component=="shared_library"', {
742 'type': 'none', 742 'type': 'none',
743 }, { 743 }, {
744 'type': 'static_library', 744 'type': 'static_library',
745 'dependencies': [ 745 'dependencies': [
746 '../../wtf/wtf.gyp:wtf', 746 '../../wtf/wtf.gyp:wtf',
747 '../../core/core.gyp/core.gyp:webcore_test_support', 747 '../../core/core_tmp.gyp:webcore_test_support',
748 ], 748 ],
749 'include_dirs': [ 749 'include_dirs': [
750 'public', 750 'public',
751 '../../core/testing/v8', # for WebCoreTestSupport.h, nee ded to link in window.internals code. 751 '../../core/testing/v8', # for WebCoreTestSupport.h, nee ded to link in window.internals code.
752 '../../../', 752 '../../../',
753 ], 753 ],
754 'sources': [ 754 'sources': [
755 'src/WebTestingSupport.cpp', 755 'src/WebTestingSupport.cpp',
756 'public/WebTestingSupport.h', 756 'public/WebTestingSupport.h',
757 ], 757 ],
(...skipping 25 matching lines...) Expand all
783 ['clang==1', { 783 ['clang==1', {
784 'target_defaults': { 784 'target_defaults': {
785 'cflags': ['-Wglobal-constructors'], 785 'cflags': ['-Wglobal-constructors'],
786 'xcode_settings': { 786 'xcode_settings': {
787 'WARNING_CFLAGS': ['-Wglobal-constructors'], 787 'WARNING_CFLAGS': ['-Wglobal-constructors'],
788 }, 788 },
789 }, 789 },
790 }], 790 }],
791 ], # conditions 791 ], # conditions
792 } 792 }
OLDNEW
« no previous file with comments | « no previous file | Source/WebKit/chromium/WebKitUnitTests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698