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

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: 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') | Source/core/core.gyp » ('J')
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.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 511 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 'src/win/WebInputEventFactory.cpp', 567 'src/win/WebInputEventFactory.cpp',
568 'src/win/WebScreenInfoFactory.cpp', 568 'src/win/WebScreenInfoFactory.cpp',
569 ], 569 ],
570 'conditions': [ 570 'conditions': [
571 ['component=="shared_library"', { 571 ['component=="shared_library"', {
572 'defines': [ 572 'defines': [
573 'WEBKIT_DLL', 573 'WEBKIT_DLL',
574 'WEBKIT_IMPLEMENTATION=1', 574 'WEBKIT_IMPLEMENTATION=1',
575 ], 575 ],
576 'dependencies': [ 576 'dependencies': [
577 '../../core/core.gyp/core.gyp:webcore_derived', 577 '../../core/core.gyp:webcore_derived',
578 '../../core/core.gyp/core.gyp:webcore_test_support', 578 '../../core/core.gyp:webcore_test_support',
579 '<(DEPTH)/base/base.gyp:test_support_base', 579 '<(DEPTH)/base/base.gyp:test_support_base',
580 '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl', 580 '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
581 '<(DEPTH)/testing/gtest.gyp:gtest', 581 '<(DEPTH)/testing/gtest.gyp:gtest',
582 '<(DEPTH)/testing/gmock.gyp:gmock', 582 '<(DEPTH)/testing/gmock.gyp:gmock',
583 '<(DEPTH)/third_party/icu/icu.gyp:*', 583 '<(DEPTH)/third_party/icu/icu.gyp:*',
584 '<(DEPTH)/third_party/libjpeg_turbo/libjpeg.gyp:libjpeg' , 584 '<(DEPTH)/third_party/libjpeg_turbo/libjpeg.gyp:libjpeg' ,
585 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng', 585 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
586 '<(DEPTH)/third_party/libxml/libxml.gyp:libxml', 586 '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
587 '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt', 587 '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt',
588 '<(DEPTH)/third_party/modp_b64/modp_b64.gyp:modp_b64', 588 '<(DEPTH)/third_party/modp_b64/modp_b64.gyp:modp_b64',
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
753 }, 753 },
754 { 754 {
755 'target_name': 'webkit_test_support', 755 'target_name': 'webkit_test_support',
756 'conditions': [ 756 'conditions': [
757 ['component=="shared_library"', { 757 ['component=="shared_library"', {
758 'type': 'none', 758 'type': 'none',
759 }, { 759 }, {
760 'type': 'static_library', 760 'type': 'static_library',
761 'dependencies': [ 761 'dependencies': [
762 '../../wtf/wtf.gyp:wtf', 762 '../../wtf/wtf.gyp:wtf',
763 '../../core/core.gyp/core.gyp:webcore_test_support', 763 '../../core/core.gyp:webcore_test_support',
764 ], 764 ],
765 'include_dirs': [ 765 'include_dirs': [
766 'public', 766 'public',
767 '../../core/testing/v8', # for WebCoreTestSupport.h, nee ded to link in window.internals code. 767 '../../core/testing/v8', # for WebCoreTestSupport.h, nee ded to link in window.internals code.
768 '../../../', 768 '../../../',
769 ], 769 ],
770 'sources': [ 770 'sources': [
771 'src/WebTestingSupport.cpp', 771 'src/WebTestingSupport.cpp',
772 'public/WebTestingSupport.h', 772 'public/WebTestingSupport.h',
773 ], 773 ],
(...skipping 25 matching lines...) Expand all
799 ['clang==1', { 799 ['clang==1', {
800 'target_defaults': { 800 'target_defaults': {
801 'cflags': ['-Wglobal-constructors'], 801 'cflags': ['-Wglobal-constructors'],
802 'xcode_settings': { 802 'xcode_settings': {
803 'WARNING_CFLAGS': ['-Wglobal-constructors'], 803 'WARNING_CFLAGS': ['-Wglobal-constructors'],
804 }, 804 },
805 }, 805 },
806 }], 806 }],
807 ], # conditions 807 ], # conditions
808 } 808 }
OLDNEW
« no previous file with comments | « no previous file | Source/WebKit/chromium/WebKitUnitTests.gyp » ('j') | Source/core/core.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698