diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-16 21:20:14 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-16 21:20:14 +0000 |
| commit | e6ff63ce883c6631405f22b6630e3ab6455cc3a1 (patch) | |
| tree | dccf4e6196ca9e42fe23eef742aa35f457cdf02e /net/net_resources.scons | |
| parent | 9e932ff8917a84af838160f1c5e88597d9159e92 (diff) | |
| download | chromium_src-e6ff63ce883c6631405f22b6630e3ab6455cc3a1.zip chromium_src-e6ff63ce883c6631405f22b6630e3ab6455cc3a1.tar.gz chromium_src-e6ff63ce883c6631405f22b6630e3ab6455cc3a1.tar.bz2 | |
Have net_resources.grd generate a .pak file too. Since the tld
data is generated and included in the .pak file, we need to add
a dependency in the SCons build. Making the corresponding
changes to mac/win is harder, so punting for now.
Review URL: http://codereview.chromium.org/18127
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8220 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net_resources.scons')
| -rw-r--r-- | net/net_resources.scons | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/net/net_resources.scons b/net/net_resources.scons index a9d8143..a48a654 100644 --- a/net/net_resources.scons +++ b/net/net_resources.scons @@ -18,18 +18,19 @@ input_files = [ 'tools/tld_cleanup/tld_cleanup$PROGSUFFIX', ] -sys.path.append(env.Dir('$CHROME_SRC_DIR/tools/grit').abspath) -env.Tool('scons', toolpath=[env.Dir('$CHROME_SRC_DIR/tools/grit/grit')]) -# This dummy target is used to tell the emitter where to put the target files. -generated = env.GRIT('$TARGET_ROOT/grit_derived_sources/dummy_net_res', - 'base/net_resources.grd') - # This dat file needed by net_resources is generated. tld_names_clean = env.Command( '$TARGET_ROOT/grit_derived_sources/effective_tld_names_clean.dat', input_files, '${SOURCES[1]} ${SOURCES[0]} $TARGET') +sys.path.append(env.Dir('$CHROME_SRC_DIR/tools/grit').abspath) +env.Tool('scons', toolpath=[env.Dir('$CHROME_SRC_DIR/tools/grit/grit')]) +# This dummy target is used to tell the emitter where to put the target files. +generated = env.GRIT('$TARGET_ROOT/grit_derived_sources/dummy_net_res', + ['base/net_resources.grd'] + tld_names_clean) + + if env.Bit('windows'): env.Prepend( RCFLAGS = [ |