diff options
| author | zerny@chromium.org <zerny@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-13 11:22:41 +0000 |
|---|---|---|
| committer | zerny@chromium.org <zerny@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-13 11:23:41 +0000 |
| commit | 48885496eb6d52f0bcd3baf5b283546c11c925c3 (patch) | |
| tree | 3fa0d43abd6983f3ba2da7af91c083129459d5f7 /extensions/BUILD.gn | |
| parent | 51dc87580da68a7f1986f134df694f874eed249c (diff) | |
| download | chromium_src-48885496eb6d52f0bcd3baf5b283546c11c925c3.zip chromium_src-48885496eb6d52f0bcd3baf5b283546c11c925c3.tar.gz chromium_src-48885496eb6d52f0bcd3baf5b283546c11c925c3.tar.bz2 | |
GN: Fix build after r289163 / r289149.
This reapplies r289149: GN: Specify grit generated output paths to be the same as gyp's.
together with outstanding CL: https://codereview.chromium.org/467023003/
TBR=brettw@chromium.org,thestig@chromium.org
NOTRY=true
NOTREECHECKS=true
BUG=
Review URL: https://codereview.chromium.org/468733003
Cr-Commit-Position: refs/heads/master@{#289264}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289264 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions/BUILD.gn')
| -rw-r--r-- | extensions/BUILD.gn | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn index 0c0b453..011221e 100644 --- a/extensions/BUILD.gn +++ b/extensions/BUILD.gn @@ -82,12 +82,12 @@ source_set("test_support") { # GYP version: //extensions/extensions.gyp:extensions_shell_and_test_pak repack("shell_and_test_pak") { sources = [ - "$root_gen_dir/chrome/common/common_resources.pak", - "$root_gen_dir/chrome/common/extensions_api_resources.pak", + "$root_gen_dir/chrome/common_resources.pak", + "$root_gen_dir/chrome/extensions_api_resources.pak", # TODO(jamescook): Extract the extension/app related resources # from generated_resources_en-US.pak. http://crbug.com/397250 - "$root_gen_dir/chrome/app/generated_resources_en-US.pak", - "$root_gen_dir/chrome/renderer/renderer_resources_100_percent.pak", + "$root_gen_dir/chrome/generated_resources_en-US.pak", + "$root_gen_dir/chrome/renderer_resources_100_percent.pak", "$root_gen_dir/content/content_resources.pak", "$root_gen_dir/content/shell/shell_resources.pak", "$root_gen_dir/extensions/extensions_renderer_resources.pak", |