diff options
| author | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-25 16:10:04 +0000 |
|---|---|---|
| committer | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-25 16:10:04 +0000 |
| commit | 55dedd6828a7e13c63f9c29e579f4b4174ed4743 (patch) | |
| tree | 39031f60ffc13b70fd9098f7480ddcdec7d170e2 /chrome | |
| parent | f24201908b538ac7f365399d90b060a8801d0aa9 (diff) | |
| download | chromium_src-55dedd6828a7e13c63f9c29e579f4b4174ed4743.zip chromium_src-55dedd6828a7e13c63f9c29e579f4b4174ed4743.tar.gz chromium_src-55dedd6828a7e13c63f9c29e579f4b4174ed4743.tar.bz2 | |
Revert 213636 "Switch Chromium to use Blink's blink_resources.grd"
Broke the build with:
error: 'gen/webkit/webkit_chromium_resources.pak', needed by 'DumpRenderTree.pak', missing and no known rule to make it
> Switch Chromium to use Blink's blink_resources.grd
>
> WebKit.grd is deprecated, so we update it public/blink_resources.grd.
>
> R=darin@chromium.org, joth@chromium.org, thestig@chromium.org
>
> Review URL: https://codereview.chromium.org/19537010
TBR=tfarina@chromium.org
Review URL: https://codereview.chromium.org/20341002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213640 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/chrome_dll.gypi | 2 | ||||
| -rw-r--r-- | chrome/chrome_repack_chrome.gypi | 2 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 8 | ||||
| -rw-r--r-- | chrome/chrome_tests_unit.gypi | 2 | ||||
| -rw-r--r-- | chrome/test/gpu/test_support_gpu.gypi | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index 2534a24..c1bbe71 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -147,7 +147,7 @@ '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', ], 'include_dirs': [ '<(DEPTH)/third_party/wtl/include', diff --git a/chrome/chrome_repack_chrome.gypi b/chrome/chrome_repack_chrome.gypi index a895435..33bdd8a 100644 --- a/chrome/chrome_repack_chrome.gypi +++ b/chrome/chrome_repack_chrome.gypi @@ -15,7 +15,7 @@ 'pak_inputs': [ '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak', ], }], ['enable_extensions==1', { diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index dc01fa2..84b38ff 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -452,7 +452,7 @@ '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 'browser/ui/views/accessibility/browser_views_accessibility_browsertest.cc', ], @@ -1923,7 +1923,7 @@ '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', ], 'include_dirs': [ '<(DEPTH)/third_party/wtl/include', @@ -2161,7 +2161,7 @@ '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', ], 'include_dirs': [ '<(DEPTH)/third_party/wtl/include', @@ -2544,7 +2544,7 @@ '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', ], 'include_dirs': [ '<(DEPTH)/third_party/wtl/include', diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index c9e2941..7ce6ef9 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -2331,7 +2331,7 @@ '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strings.rc', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', ], 'link_settings': { 'libraries': [ diff --git a/chrome/test/gpu/test_support_gpu.gypi b/chrome/test/gpu/test_support_gpu.gypi index 083c0e3..7a96dc3 100644 --- a/chrome/test/gpu/test_support_gpu.gypi +++ b/chrome/test/gpu/test_support_gpu.gypi @@ -59,7 +59,7 @@ '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', ], 'conditions': [ ['win_use_allocator_shim==1', { |