diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-08 21:58:04 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-08 21:58:04 +0000 |
| commit | 85aed525ca4109b6d3f9fe82d0b82c3a6d2cf722 (patch) | |
| tree | 78f12ef87462b62f1fd11a7116d1a771b9ca2e90 /net/net_lib.scons | |
| parent | b11c6a558fe2e45617ed715fb98ed7d1ea2e9126 (diff) | |
| download | chromium_src-85aed525ca4109b6d3f9fe82d0b82c3a6d2cf722.zip chromium_src-85aed525ca4109b6d3f9fe82d0b82c3a6d2cf722.tar.gz chromium_src-85aed525ca4109b6d3f9fe82d0b82c3a6d2cf722.tar.bz2 | |
Remove net_resources.rc and net_resources.h and replace it
with a grd file that generates the same thing. We want to do
this so on linux, we will have grit generate the .h file and
a platform specific resource file.
There's some munging going on to be able to get the
effective_tld_names_clean.dat file included in the rc.
This works in visual studio and scons. I need to update
chrome_kjs.sln and the webkit*.sln files and the mac build before committing.
Review URL: http://codereview.chromium.org/16565
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7762 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net_lib.scons')
| -rw-r--r-- | net/net_lib.scons | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/net_lib.scons b/net/net_lib.scons index 70d36e9..30e83a8 100644 --- a/net/net_lib.scons +++ b/net/net_lib.scons @@ -11,6 +11,7 @@ Import('env') env = env.Clone() env.ApplySConscript([ + '$GRIT_DIR/build/using_generated_resources.scons', '$ICU38_DIR/using_icu38.scons', '$SDCH_DIR/using_sdch.scons', '$ZLIB_DIR/using_zlib.scons', |