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

Unified Diff: Source/web/web.gyp

Issue 25195003: Prepare to move core/platform/text into blink_platform.dll (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: re-attempt upload Created 7 years, 3 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 | « Source/web/tests/ScrollAnimatorNoneTest.cpp ('k') | public/blink.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/web.gyp
diff --git a/Source/web/web.gyp b/Source/web/web.gyp
index 1edce02695dab6b7204a16c4bd404926e6817bcf..33b58ddda8a8e86577d35bb39a6da476865e5442 100644
--- a/Source/web/web.gyp
+++ b/Source/web/web.gyp
@@ -44,6 +44,7 @@
'type': '<(component)',
'variables': { 'enable_wexit_time_destructors': 1, },
'dependencies': [
+ '../platform/blink_platform.gyp:blink_common',
'../core/core.gyp:webcore',
'../modules/modules.gyp:modules',
'<(DEPTH)/skia/skia.gyp:skia',
@@ -51,7 +52,6 @@
'<(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',
@@ -263,33 +263,6 @@
}],
],
},
- {
- 'target_name': 'blink_common',
- 'type': '<(component)',
- 'variables': { 'enable_wexit_time_destructors': 1 },
- 'dependencies': [
- '../wtf/wtf.gyp:wtf',
- '<(DEPTH)/skia/skia.gyp:skia',
- '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
- ],
- 'export_dependent_settings': [
- '<(DEPTH)/skia/skia.gyp:skia',
- '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
- ],
- 'defines': [
- 'INSIDE_BLINK',
- 'BLINK_COMMON_IMPLEMENTATION=1',
- ],
- 'include_dirs': [
- '..',
- '../..',
- ],
- 'sources': [
- '../core/platform/chromium/support/WebCString.cpp',
- '../core/platform/chromium/support/WebString.cpp',
- 'WebCommon.cpp',
- ],
- },
], # targets
'conditions': [
['gcc_version>=46', {
« no previous file with comments | « Source/web/tests/ScrollAnimatorNoneTest.cpp ('k') | public/blink.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698