summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsgk@chromium.org <sgk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-10 06:20:31 +0000
committersgk@chromium.org <sgk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-10 06:20:31 +0000
commitc8471bd746e5e80c46e0fa282bef3a7792a453d3 (patch)
treee37cb2c7221aacb441590864bd4a964d6044f3c8
parentcac0669cfdf15ca9fde795f147dd94aa8943c0f4 (diff)
downloadchromium_src-c8471bd746e5e80c46e0fa282bef3a7792a453d3.zip
chromium_src-c8471bd746e5e80c46e0fa282bef3a7792a453d3.tar.gz
chromium_src-c8471bd746e5e80c46e0fa282bef3a7792a453d3.tar.bz2
Convert ui_tests.gyp, adding back precompiled_wtl to its build.
BUG=none TEST=none Review URL: http://codereview.chromium.org/119326 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18037 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/chrome.gyp12
1 files changed, 11 insertions, 1 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 10766f4..573fd33 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -2935,7 +2935,6 @@
'target_name': 'ui_tests',
'type': 'executable',
'msvs_guid': '76235B67-1C27-4627-8A33-4B2E1EF93EDE',
- 'msvs_existing_vcproj': 'test/ui/ui_tests.vcproj',
'dependencies': [
'app',
'browser',
@@ -3009,6 +3008,9 @@
'test/ui/sunspider_uitest.cc',
'test/ui/v8_benchmark_uitest.cc',
'worker/worker_uitest.cc',
+
+ 'tools/build/win/precompiled_wtl.h',
+ 'tools/build/win/precompiled_wtl.cc',
],
'conditions': [
['OS=="linux"', {
@@ -3020,6 +3022,7 @@
'browser/crash_recovery_uitest.cc',
'browser/login_prompt_uitest.cc',
'browser/metrics/metrics_service_uitest.cc',
+ 'browser/renderer_host/resource_dispatcher_host_uitest.cc',
'test/reliability/page_load_test.cc',
'test/ui/layout_plugin_uitest.cc',
],
@@ -3034,6 +3037,7 @@
# TODO(port)
'app/chrome_main_uitest.cc',
'browser/crash_recovery_uitest.cc',
+ 'browser/download/download_uitest.cc',
# blocked on download shelf
'browser/download/save_page_uitest.cc',
'browser/login_prompt_uitest.cc',
@@ -3065,6 +3069,12 @@
'-lOleAcc.lib',
],
},
+ 'configurations': {
+ 'Debug': {
+ 'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
+ 'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
+ },
+ },
}, { # else: OS != "win"
'sources!': [
# TODO(port)? (Most of these include windows.h or similar.)