diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-03 17:17:18 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-03 17:17:18 +0000 |
| commit | 0a173a23af355f6b4eceeb18f28b453063e4287c (patch) | |
| tree | 1ecdec3f47352e3ae01175dd9d112fb0bf77dca8 | |
| parent | 67bdbe0e44d9af419bdfa7d658d270c8f1005178 (diff) | |
| download | chromium_src-0a173a23af355f6b4eceeb18f28b453063e4287c.zip chromium_src-0a173a23af355f6b4eceeb18f28b453063e4287c.tar.gz chromium_src-0a173a23af355f6b4eceeb18f28b453063e4287c.tar.bz2 | |
Now that the unit_tests get built from a separate SConscript file,
refer to the *.res files we need directly by name, instead of trying
to get them from the (no longer shared) the construction environment.
Review URL: http://codereview.chromium.org/9242
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4453 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/SConscript | 3 | ||||
| -rw-r--r-- | chrome/test/unit/unit_tests.scons | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/chrome/SConscript b/chrome/SConscript index cfa8f80..77c6ba3b 100644 --- a/chrome/SConscript +++ b/chrome/SConscript @@ -59,9 +59,6 @@ if env_res['PLATFORM'] == 'win32': webkit_res, ] - env_test['BROWSER_RES'] = browser_res[0] - env_test['TEST_DATA_RES'] = test_data_res[0] - env_dll = env.Clone() env_dll.Prepend( diff --git a/chrome/test/unit/unit_tests.scons b/chrome/test/unit/unit_tests.scons index 1e9fc1e..53170d1 100644 --- a/chrome/test/unit/unit_tests.scons +++ b/chrome/test/unit/unit_tests.scons @@ -226,8 +226,8 @@ if env['PLATFORM'] == 'win32': #'$GOOGLEURL_DIR/googleurl_tests.lib', '$NET_DIR/url_request/url_request_test_job$OBJSUFFIX', - env['BROWSER_RES'], - env['TEST_DATA_RES'], + '$CHROME_DIR/browser/browser_resources.res', + '$CHROME_DIR/test/data/resource.res', ]) if env['PLATFORM'] in ('posix', 'win32'): |