diff options
| author | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-30 16:30:07 +0000 |
|---|---|---|
| committer | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-30 16:30:07 +0000 |
| commit | 9d1afcac279df4af8dcbc626cdb3ba5ad92d3137 (patch) | |
| tree | 8ec17b3402b784cb0bf2562a38ce17c1d2181852 /chrome | |
| parent | 1ce0660ee884bb08bb8375e9235622a6c06c368d (diff) | |
| download | chromium_src-9d1afcac279df4af8dcbc626cdb3ba5ad92d3137.zip chromium_src-9d1afcac279df4af8dcbc626cdb3ba5ad92d3137.tar.gz chromium_src-9d1afcac279df4af8dcbc626cdb3ba5ad92d3137.tar.bz2 | |
Bring chrome/test/chrome_plugin/ into Linux build.
BUG=2965
Review URL: http://codereview.chromium.org/5035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2717 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/SConscript | 2 | ||||
| -rw-r--r-- | chrome/test/chrome_plugin/SConscript | 51 |
2 files changed, 29 insertions, 24 deletions
diff --git a/chrome/SConscript b/chrome/SConscript index 18ca57c..e3c40b9 100644 --- a/chrome/SConscript +++ b/chrome/SConscript @@ -435,6 +435,7 @@ env.SConscript(test_sconscript_files, exports=['env_test']) sconscript_files = [ 'browser/SConscript', 'common/SConscript', + 'test/chrome_plugin/SConscript', 'third_party/hunspell/SConscript', '$THIRD_PARTY_DIR/sqlite/SConscript', ] @@ -452,7 +453,6 @@ if env['PLATFORM'] == 'win32': 'renderer/SConscript', 'test/activex_test_control/SConscript', 'test/automation/SConscript', - 'test/chrome_plugin/SConscript', 'test/interactive_ui/SConscript', 'test/memory_test/SConscript', 'test/mini_installer_test/SConscript', diff --git a/chrome/test/chrome_plugin/SConscript b/chrome/test/chrome_plugin/SConscript index 4a545e2..0f64256 100644 --- a/chrome/test/chrome_plugin/SConscript +++ b/chrome/test/chrome_plugin/SConscript @@ -18,33 +18,38 @@ env.Prepend( ], ) -env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - - '/MANIFEST', - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - - '/DEBUG', - ], - LIBS = [ - 'winmm.lib', - ], -) - input_files = [ 'test_chrome_plugin.cc', - 'test_chrome_plugin.def', ] + +if env['PLATFORM'] == 'win32': + env.Prepend( + LINKFLAGS = [ + '/INCREMENTAL', + + '/MANIFEST', + '/DELAYLOAD:"dwmapi.dll"', + '/DELAYLOAD:"uxtheme.dll"', + '/MACHINE:X86', + '/FIXED:No', + + '/safeseh', + '/dynamicbase', + '/ignore:4199', + '/nxcompat', + + '/DEBUG', + ], + LIBS = [ + 'winmm.lib', + ], + ) + + input_files.extend([ + 'test_chrome_plugin.def', + ]) + dll = env.ChromeSharedLibrary('test_chrome_plugin', input_files) i = env.Install('$TARGET_ROOT', dll) |