diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-22 03:39:59 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-22 03:39:59 +0000 |
| commit | a05584efa3fa81091675dc48adc1cb8aebb24e18 (patch) | |
| tree | 23c9188d8eda4a860d0e826399fcc3e02a220bee /base | |
| parent | a43719545eff6debe4b4f9849788b069dbcfcd15 (diff) | |
| download | chromium_src-a05584efa3fa81091675dc48adc1cb8aebb24e18.zip chromium_src-a05584efa3fa81091675dc48adc1cb8aebb24e18.tar.gz chromium_src-a05584efa3fa81091675dc48adc1cb8aebb24e18.tar.bz2 | |
Fix reference to the new exported symbols file so it works
from any build directory, not just when building in 'base'.
Make base_unittests explicitly depend on the file so it will
rebuild if we ever change the list of exported symbols.
Review URL: http://codereview.chromium.org/7853
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3720 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/base_unittests.scons | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/base/base_unittests.scons b/base/base_unittests.scons index 7767b1f9..3675e52 100644 --- a/base/base_unittests.scons +++ b/base/base_unittests.scons @@ -62,8 +62,8 @@ if env['PLATFORM'] == 'win32': if env['PLATFORM'] == 'posix': # Explicity list the functions we want to export from the base_unittest # executable in the following file. - exported_symbols_filename = \ - env.Dir('#').abspath + '/base_unittest_exported_symbols.version' + env['EXPORTED_SYMBOLS_FILE'] = \ + env.File('$ROOT_DIR/base/base_unittest_exported_symbols.version') env.Append( LIBS = [ @@ -71,7 +71,7 @@ if env['PLATFORM'] == 'posix': ], LINKFLAGS = [ '-Xlinker', - '--dynamic-list=' + exported_symbols_filename, + '--dynamic-list=$EXPORTED_SYMBOLS_FILE' ], ) @@ -183,6 +183,8 @@ if env['PLATFORM'] == 'darwin': base_unittests = env.ChromeTestProgram('base_unittests', input_files) +env.Depends(base_unittests, '$EXPORTED_SYMBOLS_FILE') + # Install up a level to allow unit test path assumptions to be valid. installed_base_unittests = env.Install('$TARGET_ROOT', base_unittests) |