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

Unified Diff: Source/WebKit/chromium/WebKit.gyp

Issue 16024011: Construct a minimal blink library in-place (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix mac again 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/WebKit/chromium/WebKitUnitTests.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebKit/chromium/WebKit.gyp
diff --git a/Source/WebKit/chromium/WebKit.gyp b/Source/WebKit/chromium/WebKit.gyp
index a028b44a6f8a004211ec08a4d2f8e28d853700dc..9f9f8524870c879d8f2aa39d3d516ef7e16e354b 100644
--- a/Source/WebKit/chromium/WebKit.gyp
+++ b/Source/WebKit/chromium/WebKit.gyp
@@ -49,6 +49,7 @@
'<(DEPTH)/third_party/icu/icu.gyp:icuuc',
'<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
'<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
+ 'blink_common',
],
'export_dependent_settings': [
'<(DEPTH)/skia/skia.gyp:skia',
@@ -64,6 +65,7 @@
],
'defines': [
'WEBKIT_IMPLEMENTATION=1',
+ 'INSIDE_WEBKIT',
],
'sources': [
'<@(webcore_platform_support_files)',
@@ -395,7 +397,6 @@
'src/WebCache.cpp',
'src/WebCachedURLRequest.cpp',
'src/WebColorName.cpp',
- 'src/WebCommon.cpp',
'src/WebCrossOriginPreflightResultCache.cpp',
'src/WebDOMActivityLogger.cpp',
'src/WebDOMCustomEvent.cpp',
@@ -557,7 +558,6 @@
['component=="shared_library"', {
'defines': [
'WEBKIT_DLL',
- 'WEBKIT_IMPLEMENTATION=1',
],
'dependencies': [
'../../core/core.gyp:webcore_derived',
@@ -745,6 +745,30 @@
}],
],
},
+ {
+ 'target_name': 'blink_common',
+ 'type': '<(component)',
+ 'variables': { 'enable_wexit_time_destructors': 1 },
+ 'dependencies': [
+ '../../wtf/wtf.gyp:wtf',
+ '<(DEPTH)/skia/skia.gyp:skia',
+ ],
+ 'defines': [
+ 'INSIDE_WEBKIT',
+ 'BLINK_COMMON_IMPLEMENTATION=1',
+ ],
+ 'include_dirs': [
+ '../..',
+ '../../..',
+ ],
+ 'sources': [
+ '../../core/platform/chromium/support/WebFilterOperation.cpp',
+ '../../core/platform/chromium/support/WebFilterOperations.cpp',
+ '../../core/platform/chromium/support/WebCString.cpp',
+ '../../core/platform/chromium/support/WebString.cpp',
+ 'src/WebCommon.cpp',
+ ],
+ },
], # targets
'conditions': [
['gcc_version>=46', {
« 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