Modified: trunk/Tools/ChangeLog (132871 => 132872)
--- trunk/Tools/ChangeLog 2012-10-30 03:49:55 UTC (rev 132871)
+++ trunk/Tools/ChangeLog 2012-10-30 06:43:43 UTC (rev 132872)
@@ -1,3 +1,15 @@
+2012-10-29 Jochen Eisinger <joc...@chromium.org>
+
+ [chromium] TestRunner needs to compile ChromiumCurrentTime and ChromiumThreading in components build
+ https://bugs.webkit.org/show_bug.cgi?id=100658
+
+ Reviewed by Tony Chang.
+
+ Before, this was compiled into DumpRenderTree. I also dropped the
+ include_dirs and dependencies block as TestRunner already has them.
+
+ * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
+
2012-10-29 Takashi Sakamoto <ta...@google.com>
Unreviewed. Adding myself as a committer.
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp (132871 => 132872)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2012-10-30 03:49:55 UTC (rev 132871)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2012-10-30 06:43:43 UTC (rev 132872)
@@ -116,6 +116,12 @@
'<(source_dir)/WebKit/chromium/public/gtk',
],
}],
+ ['inside_chromium_build==1 and component=="shared_library"', {
+ 'sources': [
+ '<(source_dir)/WebKit/chromium/src/ChromiumCurrentTime.cpp',
+ '<(source_dir)/WebKit/chromium/src/ChromiumThreading.cpp',
+ ],
+ }],
],
},
{
@@ -348,18 +354,6 @@
['exclude', 'Android\\.cpp$'],
],
}],
- ['inside_chromium_build==1 and component=="shared_library"', {
- 'sources': [
- '<(source_dir)/WebKit/chromium/src/ChromiumCurrentTime.cpp',
- '<(source_dir)/WebKit/chromium/src/ChromiumThreading.cpp',
- ],
- 'include_dirs': [
- '<(source_dir)/WebKit/chromium/public',
- ],
- 'dependencies': [
- '<(source_dir)/WTF/WTF.gyp/WTF.gyp:wtf',
- ],
- }],
['inside_chromium_build==0', {
'dependencies': [
'<(chromium_src_dir)/webkit/support/setup_third_party.gyp:third_party_headers',
