Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(127)

Unified Diff: webkit/tools/test_shell/SConscript

Issue 18186: generate test_shell.pak and hook up loading net resources from (Closed)
Patch Set: Created 11 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/tools/test_shell/SConscript
diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript
index 4a81850cbf918631535b6930b039b9d8e4f96e9f..c3d57acb5a4820191e89aa9c9eb562803b35866e 100644
--- a/webkit/tools/test_shell/SConscript
+++ b/webkit/tools/test_shell/SConscript
@@ -194,6 +194,22 @@ env.Alias('webkit', i)
if env.Bit('windows'):
env.Depends(test_shell, '$V8_DIR/vc80.pdb')
+if env.Bit('linux'):
+ # Build the linux resource file.
+ env.Append(BUILDERS = { 'Repack' : Builder(
+ action = 'python $CHROME_SRC_DIR/tools/data_pack/repack.py $TARGET $SOURCES',
+ )})
+ test_shell_data = env.Repack(
+ '$TARGET_ROOT/test_shell.pak',
+ ['$TARGET_ROOT/grit_derived_sources/net_resources.pak',
+ '$TARGET_ROOT/grit_derived_sources/webkit_resources.pak',
+ ]
+ )
+ env.Depends(test_shell, test_shell_data)
+
+ i = env.Install('$DESTINATION_ROOT', test_shell_data)
+ env.Alias('webkit', i)
+
test_files = [
'image_decoder_unittest.cc',
'keyboard_unittest.cc',

Powered by Google App Engine
This is Rietveld 408576698