diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-02 04:36:40 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-02 04:36:40 +0000 |
| commit | 3c0cc1d0d63454beb8c02aa845f8e1683a768094 (patch) | |
| tree | d3a485e035c8295a7d596d5167a0ee3ac62c644d /chrome | |
| parent | 029e6da1c9bc48fa540400814662f6cf24f537a3 (diff) | |
| download | chromium_src-3c0cc1d0d63454beb8c02aa845f8e1683a768094.zip chromium_src-3c0cc1d0d63454beb8c02aa845f8e1683a768094.tar.gz chromium_src-3c0cc1d0d63454beb8c02aa845f8e1683a768094.tar.bz2 | |
Remove webkit_chromium_resources.pak entries.
webkit_chromium_resources.pak was kept along side with blink_resources.pak,
while DumpRenderTree was being updated on the Blink side, since that already
happened and Blink has rolled into Chromium, we should be able to remove this
now.
BUG=265748
TBR=abarth@chromium.org, thestig@chromium.org
Review URL: https://codereview.chromium.org/20628004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215210 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/chrome_dll.gypi | 1 | ||||
| -rw-r--r-- | chrome/chrome_repack_chrome.gypi | 1 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 4 | ||||
| -rw-r--r-- | chrome/test/gpu/test_support_gpu.gypi | 1 |
4 files changed, 0 insertions, 7 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index be31227..3ddb424 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -148,7 +148,6 @@ '<(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 80683c5..a895435 100644 --- a/chrome/chrome_repack_chrome.gypi +++ b/chrome/chrome_repack_chrome.gypi @@ -16,7 +16,6 @@ '<(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 e96fc93..78eaa4d 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -455,7 +455,6 @@ '<(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', ], @@ -1924,7 +1923,6 @@ '<(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', @@ -2163,7 +2161,6 @@ '<(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', @@ -2547,7 +2544,6 @@ '<(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/test/gpu/test_support_gpu.gypi b/chrome/test/gpu/test_support_gpu.gypi index 4be0e525..083c0e3 100644 --- a/chrome/test/gpu/test_support_gpu.gypi +++ b/chrome/test/gpu/test_support_gpu.gypi @@ -60,7 +60,6 @@ '<(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', { |