diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-25 07:49:59 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-25 07:49:59 +0000 |
| commit | 1400d1d0af74957c230adc6b5633e092b962a4c0 (patch) | |
| tree | 3b54821f554fb4bc27cd0ff94037997b91fd42d0 /athena | |
| parent | b8f886cddd9b2128c81dd64602a6ca1af9e0bac2 (diff) | |
| download | chromium_src-1400d1d0af74957c230adc6b5633e092b962a4c0.zip chromium_src-1400d1d0af74957c230adc6b5633e092b962a4c0.tar.gz chromium_src-1400d1d0af74957c230adc6b5633e092b962a4c0.tar.bz2 | |
Fix the path to blink_resources.
We added a new blink_resources.gyp file to Blink repo in order to get
rid of blink_chromium_resources action from webkit_resources.gyp and
make the migration easier in
https://src.chromium.org/viewvc/blink?revision=178275&view=revision
This updates the Chromium side to reference the new generated path.
BUG=338338
TEST=None
R=jamesr@chromium.org
TBR=darin@chromium.org
Review URL: https://codereview.chromium.org/398243002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285524 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'athena')
| -rw-r--r-- | athena/resources/athena_resources.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/athena/resources/athena_resources.gyp b/athena/resources/athena_resources.gyp index c836d59..5bac548 100644 --- a/athena/resources/athena_resources.gyp +++ b/athena/resources/athena_resources.gyp @@ -14,7 +14,7 @@ '../../ash/ash_resources.gyp:ash_resources', '../../content/content_resources.gyp:content_resources', '../../extensions/shell/app_shell.gyp:app_shell_pak', - '../../webkit/webkit_resources.gyp:webkit_resources', + '../../third_party/WebKit/public/blink_resources.gyp:blink_resources', '../../webkit/webkit_resources.gyp:webkit_strings', ], 'actions': [{ @@ -23,8 +23,8 @@ 'pak_inputs': [ '<(PRODUCT_DIR)/app_shell.pak', '<(SHARED_INTERMEDIATE_DIR)/ash/resources/ash_resources_100_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak', ], 'pak_output': '<(PRODUCT_DIR)/athena_resources.pak', |