diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/net_resources.grd | 1 | ||||
| -rw-r--r-- | net/net_resources.scons | 13 |
2 files changed, 8 insertions, 6 deletions
diff --git a/net/base/net_resources.grd b/net/base/net_resources.grd index 655b785ca..ee8ce4d 100644 --- a/net/base/net_resources.grd +++ b/net/base/net_resources.grd @@ -5,6 +5,7 @@ <emit emit_type='prepend'></emit> </output> <output filename="net_resources.rc" type="rc_all" /> + <output filename="net_resources.pak" type="data_package" /> </outputs> <translations /> <release seq="1"> 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 = [ |