diff options
author | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-20 23:29:20 +0000 |
---|---|---|
committer | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-20 23:29:20 +0000 |
commit | 1bdfd82cea4f30a5751a19c8283b05f34612a818 (patch) | |
tree | d41f92852dc4b90c2bf4b469252e535761e27152 /base | |
parent | 126a6c706d0db79f5af75b1f019b831cf9680e70 (diff) | |
download | chromium_src-1bdfd82cea4f30a5751a19c8283b05f34612a818.zip chromium_src-1bdfd82cea4f30a5751a19c8283b05f34612a818.tar.gz chromium_src-1bdfd82cea4f30a5751a19c8283b05f34612a818.tar.bz2 |
Rolling back switch to hammer patterns again.
Review URL: http://codereview.chromium.org/7530
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3637 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r-- | base/SConscript | 16 | ||||
-rw-r--r-- | base/gfx/SConscript | 13 |
2 files changed, 11 insertions, 18 deletions
diff --git a/base/SConscript b/base/SConscript index 1248f71..fbb0516 100644 --- a/base/SConscript +++ b/base/SConscript @@ -11,7 +11,7 @@ env.Prepend( CPPPATH = [ '$ICU38_DIR/public/common', '$ICU38_DIR/public/i18n', - '$ROOT_DIR', + '..', ], CPPDEFINES = [ 'U_STATIC_IMPLEMENTATION', @@ -192,7 +192,7 @@ env_tests.Prepend( '$LIBPNG_DIR', '$ICU38_DIR/public/common', '$ICU38_DIR/public/i18n', - '$ROOT_DIR', + '..', ], CPPDEFINES = [ 'UNIT_TEST', @@ -306,7 +306,7 @@ test_files = [ if env['PLATFORM'] == 'win32': # These tests aren't really Windows-specific, they're just here until # we have the port versions working. - env_tests.ChromeProgram('debug_message', ['debug_message.cc']) + env_tests.ChromeTestProgram('debug_message', ['debug_message.cc']) test_files.extend([ 'directory_watcher_unittest.cc', @@ -338,14 +338,8 @@ if env['PLATFORM'] == 'darwin': base_unittests = env_tests.ChromeTestProgram('base_unittests', test_files) -# Temporarily put things where the buildbot expects them. -installed_base_unittests = env.Replicate('$MAIN_DIR/Hammer', base_unittests) -if env['PLATFORM'] == 'win32': - icu_data = '$OBJ_ROOT/icudt38.dll' -else: - icu_data = '$OBJ_ROOT/icudt38l.dat' -icu_data = env.Replicate('$MAIN_DIR/Hammer', icu_data) -env.Requires(installed_base_unittests, icu_data) +# Install up a level to allow unit test path assumptions to be valid. +installed_base_unittests = env.Install('$TARGET_ROOT', base_unittests) sconscript_dirs = [ diff --git a/base/gfx/SConscript b/base/gfx/SConscript index 57d1b54..c862193 100644 --- a/base/gfx/SConscript +++ b/base/gfx/SConscript @@ -6,12 +6,10 @@ Import('env') env = env.Clone() -# This path causing linux to grab the wrong time.h -env.FilterOut( - CPPPATH = [ - '$MAIN_DIR/..', - ], -) +# Remove an inherited relative path that doesn't make sense anymore. This +# makes sure we don't pull in the wrong version of time.h when building on +# linux. +env['CPPPATH'].remove('..') env.Prepend( CPPPATH = [ @@ -22,6 +20,7 @@ env.Prepend( '$LIBPNG_DIR', '$ICU38_DIR/public/common', '$ICU38_DIR/public/i18n', + '../..', ], CPPDEFINES = [ 'PNG_USER_CONFIG', @@ -63,7 +62,6 @@ if env['PLATFORM'] == 'win32': if env['PLATFORM'] == 'win32': input_files.extend([ - 'gdi_util.cc', 'bitmap_platform_device_win.cc', 'platform_canvas_win.cc', 'platform_device_win.cc', @@ -76,3 +74,4 @@ elif env['PLATFORM'] == 'posix': ]) env.ChromeStaticLibrary('base_gfx', input_files) + |