diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 17:16:46 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 17:16:46 +0000 |
| commit | da6654b0465478b0549e593c1efb45bd44756965 (patch) | |
| tree | 487788278214089228f23098346c1d02b5acfec4 /chrome/test/chrome_plugin | |
| parent | 1fbb43878f7f68c1770a12847ecd46c0f1413b3e (diff) | |
| download | chromium_src-da6654b0465478b0549e593c1efb45bd44756965.zip chromium_src-da6654b0465478b0549e593c1efb45bd44756965.tar.gz chromium_src-da6654b0465478b0549e593c1efb45bd44756965.tar.bz2 | |
Next round of SCons changes:
* Add 'gdm_fp' to the $LIBS setting in base\using_base.scons
(to be removed when that library moves into base\third_party).
* Have the grit Scanner search the Repository() copy of the source
file (necessary now that $TARGET_ROOT has changed).
* Change all the SConscript files underneath chrome\test and
chrome\tools to *.scons files, including updating their
contents with the current patterns.
* Add dependencies of the local_settings_*.res files on
the corresponding google_chrome_string_*.rc files, so they
get generated properly.
* Add generation of the chrome_exe.res resource file.
* Comment out some unnecessary .lib settings in the base
construction environment.
Review URL: http://codereview.chromium.org/10745
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5480 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/chrome_plugin')
| -rw-r--r-- | chrome/test/chrome_plugin/test_chrome_plugin.scons (renamed from chrome/test/chrome_plugin/SConscript) | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/chrome/test/chrome_plugin/SConscript b/chrome/test/chrome_plugin/test_chrome_plugin.scons index 8e6ed50..e2934cd 100644 --- a/chrome/test/chrome_plugin/SConscript +++ b/chrome/test/chrome_plugin/test_chrome_plugin.scons @@ -6,23 +6,18 @@ Import('env') env = env.Clone() +env.ApplySConscript([ + '$BASE_DIR/using_base.scons', + '$CHROME_SRC_DIR/build/using_googleurl.scons', + '$ICU38_DIR/using_icu38.scons', +]) env.Prepend( CPPPATH = [ '$CHROME_SRC_DIR', ], - LIBS = [ - 'googleurl', - env['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed - 'base', - ], ) -input_files = [ - 'test_chrome_plugin.cc', -] - - if env['PLATFORM'] == 'win32': env.Prepend( LINKFLAGS = [ @@ -46,12 +41,13 @@ if env['PLATFORM'] == 'win32': ], ) +input_files = [ + 'test_chrome_plugin.cc', +] + +if env['PLATFORM'] == 'win32': input_files.extend([ 'test_chrome_plugin.def', ]) -dll = env.ChromeSharedLibrary('test_chrome_plugin', input_files) - -i = env.Install('$TARGET_ROOT', dll) -env.Alias('chrome', i) - +env.ChromeSharedLibrary('test_chrome_plugin', input_files) |