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
This commit is contained in:
chrome
@@ -59,9 +59,6 @@ if env_res['PLATFORM'] == 'win32':
|
|||||||
webkit_res,
|
webkit_res,
|
||||||
]
|
]
|
||||||
|
|
||||||
env_test['BROWSER_RES'] = browser_res[0]
|
|
||||||
env_test['TEST_DATA_RES'] = test_data_res[0]
|
|
||||||
|
|
||||||
env_dll = env.Clone()
|
env_dll = env.Clone()
|
||||||
|
|
||||||
env_dll.Prepend(
|
env_dll.Prepend(
|
||||||
|
@@ -226,8 +226,8 @@ if env['PLATFORM'] == 'win32':
|
|||||||
#'$GOOGLEURL_DIR/googleurl_tests.lib',
|
#'$GOOGLEURL_DIR/googleurl_tests.lib',
|
||||||
'$NET_DIR/url_request/url_request_test_job$OBJSUFFIX',
|
'$NET_DIR/url_request/url_request_test_job$OBJSUFFIX',
|
||||||
|
|
||||||
env['BROWSER_RES'],
|
'$CHROME_DIR/browser/browser_resources.res',
|
||||||
env['TEST_DATA_RES'],
|
'$CHROME_DIR/test/data/resource.res',
|
||||||
])
|
])
|
||||||
|
|
||||||
if env['PLATFORM'] in ('posix', 'win32'):
|
if env['PLATFORM'] in ('posix', 'win32'):
|
||||||
|
Reference in New Issue
Block a user