diff options
| author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-04 23:46:16 +0000 |
|---|---|---|
| committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-04 23:46:16 +0000 |
| commit | 8f857ef8ff619a02e2318c120dcbb2263beaae30 (patch) | |
| tree | d5c12ee644e1f0e80e32fdfdb3ebcd5f767a8357 /extensions/extensions_resources.gyp | |
| parent | ef198a101f10c40b44c0397bd4f8a37c6ec51344 (diff) | |
| download | chromium_src-8f857ef8ff619a02e2318c120dcbb2263beaae30.zip chromium_src-8f857ef8ff619a02e2318c120dcbb2263beaae30.tar.gz chromium_src-8f857ef8ff619a02e2318c120dcbb2263beaae30.tar.bz2 | |
Reland 274764 - Reland 274558 - Move some resources to extensions_renderer_resources.grd.
This patch fixes references in the .gyp to .js resource files (again).
This breaks the remaining dependency from src/extensions to chrome resources files.
BUG=368334
TBR=rockot@chromium.org,jam@chromium.org
Review URL: https://codereview.chromium.org/312213002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274954 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions/extensions_resources.gyp')
| -rw-r--r-- | extensions/extensions_resources.gyp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/extensions/extensions_resources.gyp b/extensions/extensions_resources.gyp index 856def8..dd0e1cd 100644 --- a/extensions/extensions_resources.gyp +++ b/extensions/extensions_resources.gyp @@ -18,8 +18,20 @@ }, 'includes': [ '../build/grit_action.gypi' ], }, + { + 'action_name': 'extensions_renderer_resources', + 'variables': { + 'grit_grd_file': 'renderer/resources/extensions_renderer_resources.grd', + }, + 'includes': [ '../build/grit_action.gypi' ], + }, ], 'includes': [ '../build/grit_target.gypi' ], + 'direct_dependent_settings': { + 'include_dirs': [ + '<(SHARED_INTERMEDIATE_DIR)/extensions', + ] + }, 'hard_dependency': 1, } ] |