diff options
| author | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-05 22:19:59 +0000 |
|---|---|---|
| committer | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-05 22:19:59 +0000 |
| commit | b1ee1c29f6b7aa7c2b15d590862c333960c8654b (patch) | |
| tree | 942f9f302d819d2b3842b9e99463e7f2d158aae6 /o3d/base | |
| parent | 0f348aebf569c6acd4cf82b5954096e96458eb50 (diff) | |
| download | chromium_src-b1ee1c29f6b7aa7c2b15d590862c333960c8654b.zip chromium_src-b1ee1c29f6b7aa7c2b15d590862c333960c8654b.tar.gz chromium_src-b1ee1c29f6b7aa7c2b15d590862c333960c8654b.tar.bz2 | |
Updated O3D to work with most recent Chrome base.
Added build.scons for Chrome IPC.
Review URL: http://codereview.chromium.org/160616
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22545 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/base')
| -rw-r--r-- | o3d/base/build.scons | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/o3d/base/build.scons b/o3d/base/build.scons index 7898600..b75c7a8 100644 --- a/o3d/base/build.scons +++ b/o3d/base/build.scons @@ -38,12 +38,16 @@ env.ApplySConscript([ '$ICU38_DIR/using_icu38.scons', ]) +# For FRIEND_TEST in gtest_prod.h +env.Append(CPPPATH = '$GTEST_DIR/include') + chrome_base_inputs = [ 'at_exit', 'base_paths', 'base_switches', 'command_line', 'debug_util', + 'dynamic_annotations', 'file_path', 'file_util', 'histogram', @@ -53,6 +57,7 @@ chrome_base_inputs = [ 'message_loop', 'message_pump_default', 'path_service', + 'pickle', 'ref_counted', 'stats_table', 'string_piece', |