Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1693)

Unified Diff: chrome/test/automation/automation.scons

Issue 27060: Make basic bits of chrome/test/automation build on Linux. (Closed)
Patch Set: use base::kNoTimeout Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/test/automation/automation_handle_tracker.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/automation/automation.scons
diff --git a/chrome/test/automation/automation.scons b/chrome/test/automation/automation.scons
index 76e731c09a2b55946d5613e33b693b93afdfffdb..3f89fdd198d559fbb5548d617bb38ec37875d988 100644
--- a/chrome/test/automation/automation.scons
+++ b/chrome/test/automation/automation.scons
@@ -8,6 +8,7 @@ env = env.Clone()
env.ApplySConscript([
'$CHROME_DIR/third_party/wtl/using_wtl.scons',
+ '$CHROME_SRC_DIR/tools/grit/build/using_generated_resources.scons',
'$SKIA_DIR/using_skia.scons',
])
@@ -37,9 +38,17 @@ input_files = ChromeFileList([
'window_proxy.h',
])
-# TODO(port):
-if env.Bit('windows'):
- env.ChromeLibrary('automation', input_files)
+if not env.Bit('windows'):
+ # TODO(port): port.
+ input_files.Remove(
+ 'autocomplete_edit_proxy.cc',
+ 'browser_proxy.cc',
+ 'constrained_window_proxy.cc',
+ 'tab_proxy.cc',
+ 'window_proxy.cc',
+ )
+
+env.ChromeLibrary('automation', input_files)
p = env.ChromeMSVSProject('automation.vcproj',
dest=('$CHROME_SRC_DIR/chrome/'
« no previous file with comments | « no previous file | chrome/test/automation/automation_handle_tracker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698