diff options
| author | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-18 00:30:22 +0000 |
|---|---|---|
| committer | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-18 00:30:22 +0000 |
| commit | 012adff3836f208288c09323c0de2f93117c13c9 (patch) | |
| tree | d1af9d7e64632c7b79a774015cc0377f0801010c /base | |
| parent | 5ab78644f9d8237553aab6c0b6b97463ecd67bda (diff) | |
| download | chromium_src-012adff3836f208288c09323c0de2f93117c13c9.zip chromium_src-012adff3836f208288c09323c0de2f93117c13c9.tar.gz chromium_src-012adff3836f208288c09323c0de2f93117c13c9.tar.bz2 | |
Rolling back CL 3578, discovered hammer.bat had not been updated yet.
Review URL: http://codereview.chromium.org/7507
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3582 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/SConscript | 11 | ||||
| -rw-r--r-- | base/gfx/SConscript | 13 |
2 files changed, 11 insertions, 13 deletions
diff --git a/base/SConscript b/base/SConscript index ef462d9..2d7e8a7 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', @@ -191,7 +191,7 @@ env_tests.Prepend( '$LIBPNG_DIR', '$ICU38_DIR/public/common', '$ICU38_DIR/public/i18n', - '$ROOT_DIR', + '..', ], CPPDEFINES = [ 'UNIT_TEST', @@ -304,7 +304,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', @@ -336,9 +336,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) -env.Requires(installed_base_unittests, '$MAIN_DIR/Hammer/icudt38.dll') +# 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) + |