Modified: trunk/Source/WTF/ChangeLog (119308 => 119309)
--- trunk/Source/WTF/ChangeLog 2012-06-02 02:09:12 UTC (rev 119308)
+++ trunk/Source/WTF/ChangeLog 2012-06-02 02:47:39 UTC (rev 119309)
@@ -1,3 +1,12 @@
+2012-06-01 Xianzhu Wang <[email protected]>
+
+ Remove dependency from ImageDiff to WTF
+ https://bugs.webkit.org/show_bug.cgi?id=88147
+
+ Reviewed by Adam Barth.
+
+ * WTF.gyp/WTF.gyp:
+
2012-06-01 Tor Arne Vestbø <[email protected]>
[Qt] Save one copy when going from 8-bit WTF::String to QString
Modified: trunk/Source/WTF/WTF.gyp/WTF.gyp (119308 => 119309)
--- trunk/Source/WTF/WTF.gyp/WTF.gyp 2012-06-02 02:09:12 UTC (rev 119308)
+++ trunk/Source/WTF/WTF.gyp/WTF.gyp 2012-06-02 02:47:39 UTC (rev 119309)
@@ -94,13 +94,6 @@
}],
],
},
- 'conditions': [
- ['OS=="android" and android_build_type==0', {
- # Android builds ImageDiff for host, which has a dependency on wtf.
- # That means we need to build this target for both host and target.
- 'toolsets': ['host', 'target'],
- }],
- ]
},
{
'target_name': 'wtf',
@@ -189,11 +182,6 @@
}],
],
}],
- ['OS=="android" and android_build_type==0', {
- # Android builds ImageDiff for host, which has a dependency on wtf.
- # That means we need to build this target for both host and target.
- 'toolsets': ['host', 'target'],
- }],
],
},
]
Modified: trunk/Tools/ChangeLog (119308 => 119309)
--- trunk/Tools/ChangeLog 2012-06-02 02:09:12 UTC (rev 119308)
+++ trunk/Tools/ChangeLog 2012-06-02 02:47:39 UTC (rev 119309)
@@ -1,3 +1,12 @@
+2012-06-01 Xianzhu Wang <[email protected]>
+
+ Remove dependency from ImageDiff to WTF
+ https://bugs.webkit.org/show_bug.cgi?id=88147
+
+ Reviewed by Adam Barth.
+
+ * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
+
2012-06-01 Dirk Pranke <[email protected]>
NRWT seems to leak (more?) temp dirs
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp (119308 => 119309)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2012-06-02 02:09:12 UTC (rev 119308)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2012-06-02 02:47:39 UTC (rev 119309)
@@ -56,21 +56,23 @@
'type': 'executable',
'dependencies': [
'<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support_gfx',
- '<(source_dir)/WTF/WTF.gyp/WTF.gyp:wtf',
],
'include_dirs': [
- '<(source_dir)/_javascript_Core',
+ '<(source_dir)/WTF',
'<(DEPTH)',
],
'sources': [
'<(tools_dir)/DumpRenderTree/chromium/ImageDiff.cpp',
],
'conditions': [
- ['OS=="android"', {
+ ['OS=="android" and android_build_type==0', {
# The Chromium Android port will compare images on host rather
# than target (a device or emulator) for performance reasons.
'toolsets': ['host'],
}],
+ ['OS=="android" and android_build_type!=0', {
+ 'type': 'none',
+ }],
],
},
{
@@ -243,7 +245,6 @@
['OS=="android"', {
'type': 'shared_library',
'dependencies': [
- 'ImageDiff#host',
'<(chromium_src_dir)/base/base.gyp:test_support_base',
'<(chromium_src_dir)/tools/android/forwarder/forwarder.gyp:forwarder',
'<(chromium_src_dir)/testing/android/native_test.gyp:native_test_native_code',
@@ -265,6 +266,11 @@
['exclude', 'Android\\.cpp$'],
],
}],
+ ['OS=="android" and android_build_type==0', {
+ 'dependencies': [
+ 'ImageDiff#host',
+ ],
+ }],
['inside_chromium_build==1 and component=="shared_library"', {
'sources': [
'<(source_dir)/WebKit/chromium/src/ChromiumCurrentTime.cpp',
