Modified: trunk/Source/WebCore/ChangeLog (127994 => 127995)
--- trunk/Source/WebCore/ChangeLog 2012-09-09 21:04:02 UTC (rev 127994)
+++ trunk/Source/WebCore/ChangeLog 2012-09-09 21:04:49 UTC (rev 127995)
@@ -1,3 +1,15 @@
+2012-09-09 James Robinson <[email protected]>
+
+ [chromium] webkit_platform should only be linked into the webkit target
+ https://bugs.webkit.org/show_bug.cgi?id=96213
+
+ Reviewed by Adrienne Walker.
+
+ The Platform.gyp:webkit_platform target provides the implementation of several WEBKIT_EXPORTed symbols. It only
+ makes sense as a target of WebKit.gyp:webkit, other targets shouldn't directly depend on it.
+
+ * WebCore.gyp/WebCore.gyp:
+
2012-09-09 Gyuyoung Kim <[email protected]>
[EFL] Fix build break when MEDIA_STREAM is enabled.
Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (127994 => 127995)
--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-09-09 21:04:02 UTC (rev 127994)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-09-09 21:04:49 UTC (rev 127995)
@@ -1335,7 +1335,6 @@
'../../ThirdParty/glu/glu.gyp:libtess',
'../../_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp:yarr',
'../../WTF/WTF.gyp/WTF.gyp:wtf',
- '../../Platform/Platform.gyp/Platform.gyp:webkit_platform',
'<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
'<(chromium_src_dir)/skia/skia.gyp:skia',
'<(chromium_src_dir)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg',
@@ -1355,7 +1354,6 @@
'export_dependent_settings': [
'../../_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp:yarr',
'../../WTF/WTF.gyp/WTF.gyp:wtf',
- '../../Platform/Platform.gyp/Platform.gyp:webkit_platform',
'<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
'<(chromium_src_dir)/skia/skia.gyp:skia',
'<(chromium_src_dir)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg',
@@ -1380,6 +1378,7 @@
'WEBCORE_NAVIGATOR_VENDOR="Google Inc."',
],
'include_dirs': [
+ '../../Platform/chromium',
'<(INTERMEDIATE_DIR)',
'<@(webcore_include_dirs)',
'<(chromium_src_dir)/gpu',
@@ -2146,7 +2145,6 @@
'webcore_rendering',
# Exported.
'webcore_bindings',
- '../../Platform/Platform.gyp/Platform.gyp:webkit_platform',
'../../WTF/WTF.gyp/WTF.gyp:wtf',
'<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
'<(chromium_src_dir)/skia/skia.gyp:skia',
@@ -2156,7 +2154,6 @@
],
'export_dependent_settings': [
'webcore_bindings',
- '../../Platform/Platform.gyp/Platform.gyp:webkit_platform',
'../../WTF/WTF.gyp/WTF.gyp:wtf',
'<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
'<(chromium_src_dir)/skia/skia.gyp:skia',
Modified: trunk/Source/WebKit/chromium/ChangeLog (127994 => 127995)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-09-09 21:04:02 UTC (rev 127994)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-09-09 21:04:49 UTC (rev 127995)
@@ -1,5 +1,17 @@
2012-09-09 James Robinson <[email protected]>
+ [chromium] webkit_platform should only be linked into the webkit target
+ https://bugs.webkit.org/show_bug.cgi?id=96213
+
+ Reviewed by Adrienne Walker.
+
+ The Platform.gyp:webkit_platform target provides the implementation of several WEBKIT_EXPORTed symbols. It only
+ makes sense as a target of WebKit.gyp:webkit, other targets shouldn't directly depend on it.
+
+ * WebKit.gyp:
+
+2012-09-09 James Robinson <[email protected]>
+
[chromium] Use WebCompositorSupport creation functions in GraphicsLayerChromiumTest
https://bugs.webkit.org/show_bug.cgi?id=96212
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (127994 => 127995)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2012-09-09 21:04:02 UTC (rev 127994)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2012-09-09 21:04:49 UTC (rev 127995)
@@ -865,12 +865,14 @@
'target_name': 'webkit_wtf_support',
'type': 'static_library',
'dependencies': [
- '../../Platform/Platform.gyp/Platform.gyp:webkit_platform',
'../../WTF/WTF.gyp/WTF.gyp:wtf',
],
'defines': [
'WEBKIT_IMPLEMENTATION=1',
],
+ 'include_dirs': [
+ '../../Platform/chromium',
+ ],
'sources': [
'src/ChromiumCurrentTime.cpp',
'src/ChromiumOSRandomSource.cpp',
