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

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

Issue 14238015: Move Source/WTF/wtf to Source/wtf (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 8 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 731 matching lines...) Expand 10 before | Expand all | Expand 10 after
742 ['include', '^src/linux/WebFontRendering\\.cpp$'], 742 ['include', '^src/linux/WebFontRendering\\.cpp$'],
743 ['include', '^src/linux/WebFontRenderStyle\\.cpp$'], 743 ['include', '^src/linux/WebFontRenderStyle\\.cpp$'],
744 ], 744 ],
745 }], 745 }],
746 ], 746 ],
747 }, 747 },
748 { 748 {
749 'target_name': 'webkit_wtf_support', 749 'target_name': 'webkit_wtf_support',
750 'type': 'static_library', 750 'type': 'static_library',
751 'dependencies': [ 751 'dependencies': [
752 '../../WTF/WTF.gyp/WTF.gyp:wtf', 752 '../../wtf/wtf.gyp:wtf',
753 ], 753 ],
754 'defines': [ 754 'defines': [
755 'WEBKIT_IMPLEMENTATION=1', 755 'WEBKIT_IMPLEMENTATION=1',
756 ], 756 ],
757 'include_dirs': [ 757 'include_dirs': [
758 '../../Platform/chromium', 758 '../../Platform/chromium',
759 ], 759 ],
760 'sources': [ 760 'sources': [
761 'src/ChromiumCurrentTime.cpp', 761 'src/ChromiumCurrentTime.cpp',
762 'src/ChromiumOSRandomSource.cpp', 762 'src/ChromiumOSRandomSource.cpp',
763 'src/ChromiumThreading.cpp', 763 'src/ChromiumThreading.cpp',
764 ], 764 ],
765 'conditions': [ 765 'conditions': [
766 ['component=="shared_library"', { 766 ['component=="shared_library"', {
767 'defines': [ 767 'defines': [
768 'WEBKIT_DLL', 768 'WEBKIT_DLL',
769 ], 769 ],
770 }], 770 }],
771 ], 771 ],
772 }, 772 },
773 { 773 {
774 'target_name': 'webkit_test_support', 774 'target_name': 'webkit_test_support',
775 'conditions': [ 775 'conditions': [
776 ['component=="shared_library"', { 776 ['component=="shared_library"', {
777 'type': 'none', 777 'type': 'none',
778 }, { 778 }, {
779 'type': 'static_library', 779 'type': 'static_library',
780 'dependencies': [ 780 'dependencies': [
781 '../../WTF/WTF.gyp/WTF.gyp:wtf', 781 '../../wtf/wtf.gyp:wtf',
782 '../../WebCore/WebCore.gyp/WebCore.gyp:webcore_test_supp ort', 782 '../../WebCore/WebCore.gyp/WebCore.gyp:webcore_test_supp ort',
783 ], 783 ],
784 'include_dirs': [ 784 'include_dirs': [
785 'public', 785 'public',
786 '../../WebCore/testing/v8', # for WebCoreTestSupport.h, needed to link in window.internals code. 786 '../../WebCore/testing/v8', # for WebCoreTestSupport.h, needed to link in window.internals code.
787 '../../Platform/chromium/', 787 '../../Platform/chromium/',
788 ], 788 ],
789 'sources': [ 789 'sources': [
790 'src/WebTestingSupport.cpp', 790 'src/WebTestingSupport.cpp',
791 'public/WebTestingSupport.h', 791 'public/WebTestingSupport.h',
(...skipping 26 matching lines...) Expand all
818 ['clang==1', { 818 ['clang==1', {
819 'target_defaults': { 819 'target_defaults': {
820 'cflags': ['-Wglobal-constructors'], 820 'cflags': ['-Wglobal-constructors'],
821 'xcode_settings': { 821 'xcode_settings': {
822 'WARNING_CFLAGS': ['-Wglobal-constructors'], 822 'WARNING_CFLAGS': ['-Wglobal-constructors'],
823 }, 823 },
824 }, 824 },
825 }], 825 }],
826 ], # conditions 826 ], # conditions
827 } 827 }
OLDNEW
« no previous file with comments | « Source/WebCore/config.h ('k') | Source/bindings/bindings.gyp » ('j') | Source/config.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698