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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webkit/webkit.gyp

Issue 340049: Extract webkit api target from webkit.gyp (Closed)
Patch Set: Created 11 years, 2 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 side-by-side diff with in-line comments
Download patch
« chrome/chrome.gyp ('K') | « webkit/tools/test_shell/test_shell.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/webkit.gyp
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index d4f45c6fb5b033838244d4389665fdfd1260071d..bbc8b6daade7c63c2686f10af95d141878220e07 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -57,312 +57,6 @@
],
},
{
- 'target_name': 'webkit',
- 'type': '<(library)',
- 'msvs_guid': '5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65',
- 'dependencies': [
- '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore',
- ],
- 'include_dirs': [
- 'api/public',
- 'api/src',
- ],
- 'defines': [
- 'WEBKIT_IMPLEMENTATION',
- ],
- 'sources': [
- 'api/public/gtk/WebInputEventFactory.h',
- 'api/public/linux/WebFontRendering.h',
- 'api/public/x11/WebScreenInfoFactory.h',
- 'api/public/mac/WebInputEventFactory.h',
- 'api/public/mac/WebScreenInfoFactory.h',
- 'api/public/WebAccessibilityObject.h',
- 'api/public/WebAccessibilityRole.h',
- 'api/public/WebApplicationCacheHost.h',
- 'api/public/WebApplicationCacheHostClient.h',
- 'api/public/WebBindings.h',
- 'api/public/WebCache.h',
- 'api/public/WebCanvas.h',
- 'api/public/WebClipboard.h',
- 'api/public/WebColor.h',
- 'api/public/WebColorName.h',
- 'api/public/WebCommon.h',
- 'api/public/WebCompositionCommand.h',
- 'api/public/WebConsoleMessage.h',
- 'api/public/WebContextMenuData.h',
- 'api/public/WebCookie.h',
- 'api/public/WebCrossOriginPreflightResultCache.h',
- 'api/public/WebCString.h',
- 'api/public/WebCursorInfo.h',
- 'api/public/WebData.h',
- 'api/public/WebDatabase.h',
- 'api/public/WebDatabaseObserver.h',
- 'api/public/WebDataSource.h',
- 'api/public/WebDevToolsAgent.h',
- 'api/public/WebDevToolsAgentClient.h',
- 'api/public/WebDevToolsFrontend.h',
- 'api/public/WebDevToolsFrontendClient.h',
- 'api/public/WebDragData.h',
- 'api/public/WebEditingAction.h',
- 'api/public/WebFileChooserCompletion.h',
- 'api/public/WebFindOptions.h',
- 'api/public/WebFrame.h',
- 'api/public/WebFrameClient.h',
- 'api/public/WebFontCache.h',
- 'api/public/WebForm.h',
- 'api/public/WebHistoryItem.h',
- 'api/public/WebHTTPBody.h',
- 'api/public/WebImage.h',
- 'api/public/WebInputEvent.h',
- 'api/public/WebKit.h',
- 'api/public/WebKitClient.h',
- 'api/public/WebLocalizedString.h',
- 'api/public/WebMediaPlayer.h',
- 'api/public/WebMediaPlayerAction.h',
- 'api/public/WebMediaPlayerClient.h',
- 'api/public/WebMessagePortChannel.h',
- 'api/public/WebMessagePortChannelClient.h',
- 'api/public/WebMimeRegistry.h',
- 'api/public/WebNavigationType.h',
- 'api/public/WebNode.h',
- 'api/public/WebNonCopyable.h',
- 'api/public/WebNotification.h',
- 'api/public/WebNotificationPresenter.h',
- 'api/public/WebNotificationPermissionCallback.h',
- 'api/public/WebPlugin.h',
- 'api/public/WebPluginContainer.h',
- 'api/public/WebPluginListBuilder.h',
- 'api/public/WebPoint.h',
- 'api/public/WebPopupMenu.h',
- 'api/public/WebPopupMenuInfo.h',
- 'api/public/WebRange.h',
- 'api/public/WebRect.h',
- 'api/public/WebRuntimeFeatures.h',
- 'api/public/WebScreenInfo.h',
- 'api/public/WebScriptController.h',
- 'api/public/WebScriptSource.h',
- 'api/public/WebSearchableFormData.h',
- 'api/public/WebSecurityOrigin.h',
- 'api/public/WebSecurityPolicy.h',
- 'api/public/WebSettings.h',
- 'api/public/WebSize.h',
- 'api/public/WebSocketStreamError.h',
- 'api/public/WebSocketStreamHandle.h',
- 'api/public/WebSocketStreamHandleClient.h',
- 'api/public/WebStorageArea.h',
- 'api/public/WebStorageEventDispatcher.h',
- 'api/public/WebStorageNamespace.h',
- 'api/public/WebString.h',
- 'api/public/WebTextAffinity.h',
- 'api/public/WebTextDirection.h',
- 'api/public/WebURL.h',
- 'api/public/WebURLError.h',
- 'api/public/WebURLLoader.h',
- 'api/public/WebURLLoaderClient.h',
- 'api/public/WebURLRequest.h',
- 'api/public/WebURLResponse.h',
- 'api/public/WebVector.h',
- 'api/public/WebView.h',
- 'api/public/WebViewClient.h',
- 'api/public/WebWidget.h',
- 'api/public/WebWidgetClient.h',
- 'api/public/WebWorker.h',
- 'api/public/WebWorkerClient.h',
- 'api/public/win/WebInputEventFactory.h',
- 'api/public/win/WebSandboxSupport.h',
- 'api/public/win/WebScreenInfoFactory.h',
- 'api/public/win/WebScreenInfoFactory.h',
- 'api/src/ApplicationCacheHost.cpp',
- 'api/src/AssertMatchingEnums.cpp',
- 'api/src/AutocompletePopupMenuClient.cpp',
- 'api/src/AutocompletePopupMenuClient.h',
- 'api/src/BackForwardListClientImpl.cpp',
- 'api/src/BackForwardListClientImpl.h',
- 'api/src/ChromeClientImpl.cpp',
- 'api/src/ChromeClientImpl.h',
- 'api/src/ChromiumBridge.cpp',
- 'api/src/ChromiumCurrentTime.cpp',
- 'api/src/ChromiumThreading.cpp',
- 'api/src/ContextMenuClientImpl.cpp',
- 'api/src/ContextMenuClientImpl.h',
- 'api/src/DOMUtilitiesPrivate.cpp',
- 'api/src/DOMUtilitiesPrivate.h',
- 'api/src/DragClientImpl.cpp',
- 'api/src/DragClientImpl.h',
- 'api/src/EditorClientImpl.cpp',
- 'api/src/EditorClientImpl.h',
- 'api/src/FrameLoaderClientImpl.cpp',
- 'api/src/FrameLoaderClientImpl.h',
- 'api/src/EmptyWebFrameClientImpl.h',
- 'api/src/gtk/WebFontInfo.cpp',
- 'api/src/gtk/WebFontInfo.h',
- 'api/src/gtk/WebInputEventFactory.cpp',
- 'api/src/InspectorClientImpl.cpp',
- 'api/src/InspectorClientImpl.h',
- 'api/src/linux/WebFontRendering.cpp',
- 'api/src/x11/WebScreenInfoFactory.cpp',
- 'api/src/mac/WebInputEventFactory.mm',
- 'api/src/mac/WebScreenInfoFactory.mm',
- 'api/src/LocalizedStrings.cpp',
- 'api/src/MediaPlayerPrivateChromium.cpp',
- 'api/src/NotificationPresenterImpl.h',
- 'api/src/NotificationPresenterImpl.cpp',
- 'api/src/PasswordAutocompleteListener.h',
- 'api/src/PlatformMessagePortChannel.cpp',
- 'api/src/PlatformMessagePortChannel.h',
- 'api/src/ResourceHandle.cpp',
- 'api/src/SharedWorkerRepository.cpp',
- 'api/src/SocketStreamHandle.cpp',
- 'api/src/StorageAreaProxy.cpp',
- 'api/src/StorageAreaProxy.h',
- 'api/src/StorageEventDispatcherChromium.cpp',
- 'api/src/StorageEventDispatcherImpl.cpp',
- 'api/src/StorageEventDispatcherImpl.h',
- 'api/src/StorageNamespaceProxy.cpp',
- 'api/src/StorageNamespaceProxy.h',
- 'api/src/TemporaryGlue.h',
- 'api/src/WebAccessibilityObject.cpp',
- 'api/src/WebBindings.cpp',
- 'api/src/WebCache.cpp',
- 'api/src/WebColor.cpp',
- 'api/src/WebCrossOriginPreflightResultCache.cpp',
- 'api/src/WebCString.cpp',
- 'api/src/WebCursorInfo.cpp',
- 'api/src/WebData.cpp',
- 'api/src/WebDatabase.cpp',
- 'api/src/WebDataSourceImpl.cpp',
- 'api/src/WebDataSourceImpl.h',
- 'api/src/WebDragData.cpp',
- 'api/src/WebFileChooserCompletionImpl.cpp',
- 'api/src/WebFileChooserCompletionImpl.h',
- 'api/src/WebFontCache.cpp',
- 'api/src/WebForm.cpp',
- 'api/src/WebFrameImpl.cpp',
- 'api/src/WebFrameImpl.h',
- 'api/src/WebHistoryItem.cpp',
- 'api/src/WebHTTPBody.cpp',
- 'api/src/WebImageCG.cpp',
- 'api/src/WebImageSkia.cpp',
- 'api/src/WebInputEvent.cpp',
- 'api/src/WebInputEventConversion.cpp',
- 'api/src/WebInputEventConversion.h',
- 'api/src/WebKit.cpp',
- 'api/src/WebMediaPlayerClientImpl.cpp',
- 'api/src/WebMediaPlayerClientImpl.h',
- 'api/src/WebNode.cpp',
- 'api/src/WebNotification.cpp',
- 'api/src/WebPluginContainerImpl.h',
- 'api/src/WebPluginContainerImpl.cpp',
- 'api/src/WebPluginListBuilderImpl.cpp',
- 'api/src/WebPluginListBuilderImpl.h',
- 'api/src/WebPluginLoadObserver.cpp',
- 'api/src/WebPluginLoadObserver.h',
- 'api/src/WebPopupMenuImpl.cpp',
- 'api/src/WebPopupMenuImpl.h',
- 'api/src/WebRange.cpp',
- 'api/src/WebRuntimeFeatures.cpp',
- 'api/src/WebScriptController.cpp',
- 'api/src/WebSearchableFormData.cpp',
- 'api/src/WebSecurityOrigin.cpp',
- 'api/src/WebSecurityPolicy.cpp',
- 'api/src/WebSettingsImpl.cpp',
- 'api/src/WebSettingsImpl.h',
- 'api/src/WebStorageAreaImpl.cpp',
- 'api/src/WebStorageAreaImpl.h',
- 'api/src/WebStorageEventDispatcherImpl.cpp',
- 'api/src/WebStorageEventDispatcherImpl.h',
- 'api/src/WebStorageNamespaceImpl.cpp',
- 'api/src/WebStorageNamespaceImpl.h',
- 'api/src/WebString.cpp',
- 'api/src/WebURL.cpp',
- 'api/src/WebURLRequest.cpp',
- 'api/src/WebURLRequestPrivate.h',
- 'api/src/WebURLResponse.cpp',
- 'api/src/WebURLResponsePrivate.h',
- 'api/src/WebURLError.cpp',
- 'api/src/WebViewImpl.cpp',
- 'api/src/WebViewImpl.h',
- 'api/src/WebWorkerClientImpl.cpp',
- 'api/src/WebWorkerClientImpl.h',
- 'api/src/WebWorkerImpl.cpp',
- 'api/src/WebWorkerImpl.h',
- 'api/src/WrappedResourceRequest.h',
- 'api/src/WrappedResourceResponse.h',
- 'api/src/win/WebInputEventFactory.cpp',
- 'api/src/win/WebScreenInfoFactory.cpp',
- ],
- 'conditions': [
- ['OS=="linux" or OS=="freebsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:fontconfig',
- '../build/linux/system.gyp:gtk',
- '../build/linux/system.gyp:x11',
- ],
- 'include_dirs': [
- 'api/public/x11',
- 'api/public/gtk',
- 'api/public/linux',
- ],
- }, { # else: OS!="linux" and OS!="freebsd"
- 'sources/': [
- ['exclude', '/gtk/'],
- ['exclude', '/x11/'],
- ['exclude', '/linux/'],
- ],
- }],
- ['OS=="mac"', {
- 'include_dirs': [
- 'api/public/mac',
- ],
- 'sources/': [
- ['exclude', 'Skia\\.cpp$'],
- ],
- }, { # else: OS!="mac"
- 'sources/': [
- ['exclude', '/mac/'],
- ['exclude', 'CG\\.cpp$'],
- ],
- }],
- ['OS=="win"', {
- 'include_dirs': [
- 'api/public/win',
- ],
- }, { # else: OS!="win"
- 'sources/': [['exclude', '/win/']],
- }],
- ['"ENABLE_3D_CANVAS=1" in feature_defines', {
- # Conditionally compile in GLEW and our GraphicsContext3D implementation.
- 'sources+': [
- 'api/src/GraphicsContext3D.cpp',
- '../third_party/glew/src/glew.c'
- ],
- 'include_dirs+': [
- '../third_party/glew/include'
- ],
- 'defines+': [
- 'GLEW_STATIC=1',
- 'GLEW_NO_GLU=1',
- ],
- 'conditions': [
- ['OS=="win"', {
- 'link_settings': {
- 'libraries': [
- '-lopengl32.lib',
- ],
- },
- }],
- ['OS=="mac"', {
- 'link_settings': {
- 'libraries': [
- '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
- ],
- },
- }],
- ],
- }],
- ],
- },
- {
'target_name': 'webkit_resources',
'type': 'none',
'msvs_guid': '0B469837-3D46-484A-AFB3-C5A6C68730B9',
@@ -442,7 +136,7 @@
'msvs_guid': '0B945915-31A7-4A07-A5B5-568D737A39B1',
'dependencies': [
'../net/net.gyp:net',
- 'webkit',
+ 'api/WebKitAPI.gyp:webkit_api',
],
'sources': [
# This list contains all .h and .cc in appcache except for test code.
@@ -505,7 +199,7 @@
'../net/net.gyp:net',
'inspector_resources',
'../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore',
- 'webkit',
+ 'api/WebKitAPI.gyp:webkit_api',
'webkit_resources',
'webkit_strings',
],
« chrome/chrome.gyp ('K') | « webkit/tools/test_shell/test_shell.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698