diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-18 22:10:33 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-18 22:10:33 +0000 |
| commit | 81f30ce92caabbea1dcc410cdb52b5707882068c (patch) | |
| tree | 3d5760510d6b39b83af72e57aa0f517864364d39 /content/content_shell.gypi | |
| parent | b0b67cfeb903dc6a59e30bd6907808142c05fdcc (diff) | |
| download | chromium_src-81f30ce92caabbea1dcc410cdb52b5707882068c.zip chromium_src-81f30ce92caabbea1dcc410cdb52b5707882068c.tar.gz chromium_src-81f30ce92caabbea1dcc410cdb52b5707882068c.tar.bz2 | |
content/GTK: Renderers must have a ResourceBundle.
Parts of ui/ and webkit/ use the ResourceBundle. Include a minimal one
with non-chrome resources for the content_shell, and initialize it in
child processes before we turn on the sandbox.
BUG=90445
Review URL: http://codereview.chromium.org/9232013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118163 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_shell.gypi')
| -rw-r--r-- | content/content_shell.gypi | 43 |
1 files changed, 42 insertions, 1 deletions
diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 1045301..11153f5 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -1,4 +1,4 @@ -# Copyright (c) 2011 The Chromium Authors. All rights reserved. +# Copyright (c) 2012 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -104,6 +104,46 @@ ], }, { + # We build a minimal set of resources so WebKit in content_shell has + # access to necessary resources. + 'target_name': 'content_shell_pak', + 'type': 'none', + 'variables': { + 'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py', + }, + 'actions': [ + { + 'action_name': 'repack_content_shell_pack', + 'variables': { + 'pak_inputs': [ + '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.pak', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', + ], + 'conditions': [ + ['OS != "mac"', { + 'pak_inputs': [ + '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.pak', + ] + }], + ], + }, + 'inputs': [ + '<(repack_path)', + '<@(pak_inputs)', + ], + 'outputs': [ + '<(PRODUCT_DIR)/content_shell.pak', + ], + 'action': ['python', '<(repack_path)', '<@(_outputs)', + '<@(pak_inputs)'], + }, + ], + }, + { 'target_name': 'content_shell', 'type': 'executable', 'defines!': ['CONTENT_IMPLEMENTATION'], @@ -112,6 +152,7 @@ }, 'dependencies': [ 'content_shell_lib', + 'content_shell_pak', ], 'include_dirs': [ '..', |