Modified: trunk/Source/WebKit/chromium/ChangeLog (131949 => 131950)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-10-19 22:11:22 UTC (rev 131949)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-10-19 22:24:08 UTC (rev 131950)
@@ -1,3 +1,11 @@
+2012-10-19 Jochen Eisinger <[email protected]>
+
+ [chromium] when building a shared library component build, we must not depend on WebCore
+
+ Unreviewed build fix.
+
+ * WebKit.gyp:
+
2012-10-19 Tony Chang <[email protected]>
Unreviewed, rolling out r131936.
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (131949 => 131950)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2012-10-19 22:11:22 UTC (rev 131949)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2012-10-19 22:24:08 UTC (rev 131950)
@@ -865,22 +865,23 @@
},
{
'target_name': 'webkit_test_support',
- 'type': 'static_library',
- 'dependencies': [
- '../../WTF/WTF.gyp/WTF.gyp:wtf',
- '../../WebCore/WebCore.gyp/WebCore.gyp:webcore_test_support',
- ],
- 'include_dirs': [
- 'public',
- '../../WebCore/testing/v8', # for WebCoreTestSupport.h, needed to link in window.internals code.
- ],
- 'sources': [
- 'src/WebTestingSupport.cpp',
- 'public/WebTestingSupport.h',
- ],
'conditions': [
['inside_chromium_build==1 and component=="shared_library"', {
'type': 'none',
+ }, { # else: inside_chromium_build==0 or component!="shared_library"
+ 'type': 'static_library',
+ 'dependencies': [
+ '../../WTF/WTF.gyp/WTF.gyp:wtf',
+ '../../WebCore/WebCore.gyp/WebCore.gyp:webcore_test_support',
+ ],
+ 'include_dirs': [
+ 'public',
+ '../../WebCore/testing/v8', # for WebCoreTestSupport.h, needed to link in window.internals code.
+ ],
+ 'sources': [
+ 'src/WebTestingSupport.cpp',
+ 'public/WebTestingSupport.h',
+ ],
}],
],
},
