Commit 193c45d8 authored by thakis@chromium.org's avatar thakis@chromium.org

Remove .rc files that are in resources.pak from test sources.

Since these tests run on non-Windows platforms, the pak file seems to be loaded
fine and these .rc files should not be necessary.

BUG=297672
NOTRY=true

Review URL: https://codereview.chromium.org/125103007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243503 0039d316-1c4b-4281-b951-d872f2087c98
parent 7764559a
...@@ -468,15 +468,8 @@ ...@@ -468,15 +468,8 @@
# their various targets (net.gyp:net_resources, etc.), # their various targets (net.gyp:net_resources, etc.),
# but that causes errors in other targets when # but that causes errors in other targets when
# resulting .res files get referenced multiple times. # resulting .res files get referenced multiple times.
'<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', '<(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)/ui/ui_resources/ui_unscaled_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
'browser/ui/views/accessibility/browser_views_accessibility_browsertest.cc', 'browser/ui/views/accessibility/browser_views_accessibility_browsertest.cc',
], ],
...@@ -1846,15 +1839,8 @@ ...@@ -1846,15 +1839,8 @@
}], }],
['OS=="win"', { ['OS=="win"', {
'sources': [ 'sources': [
'<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', '<(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)/ui/ui_resources/ui_unscaled_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
], ],
'include_dirs': [ 'include_dirs': [
'<(DEPTH)/third_party/wtl/include', '<(DEPTH)/third_party/wtl/include',
...@@ -2140,15 +2126,8 @@ ...@@ -2140,15 +2126,8 @@
'conditions': [ 'conditions': [
['OS=="win"', { ['OS=="win"', {
'sources': [ 'sources': [
'<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', '<(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)/ui/ui_resources/ui_unscaled_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
], ],
'include_dirs': [ 'include_dirs': [
'<(DEPTH)/third_party/wtl/include', '<(DEPTH)/third_party/wtl/include',
...@@ -2505,15 +2484,8 @@ ...@@ -2505,15 +2484,8 @@
['OS=="win"', { ['OS=="win"', {
'msvs_large_pdb': 1, 'msvs_large_pdb': 1,
'sources': [ 'sources': [
'<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', '<(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)/ui/ui_resources/ui_unscaled_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
], ],
'include_dirs': [ 'include_dirs': [
'<(DEPTH)/third_party/wtl/include', '<(DEPTH)/third_party/wtl/include',
...@@ -2620,10 +2592,6 @@ ...@@ -2620,10 +2592,6 @@
}], }],
['OS=="win"', { ['OS=="win"', {
'sources': [ 'sources': [
'<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
], ],
'include_dirs': [ 'include_dirs': [
......
...@@ -541,7 +541,6 @@ ...@@ -541,7 +541,6 @@
'../extensions/common/url_pattern_unittest.cc', '../extensions/common/url_pattern_unittest.cc',
'../extensions/common/user_script_unittest.cc', '../extensions/common/user_script_unittest.cc',
'app/chrome_dll.rc', 'app/chrome_dll.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc',
# All unittests in browser, common, renderer and service. # All unittests in browser, common, renderer and service.
'browser/about_flags_unittest.cc', 'browser/about_flags_unittest.cc',
'browser/app_controller_mac_unittest.mm', 'browser/app_controller_mac_unittest.mm',
...@@ -2482,15 +2481,9 @@ ...@@ -2482,15 +2481,9 @@
# their various targets (net.gyp:net_resources, etc.), # their various targets (net.gyp:net_resources, etc.),
# but that causes errors in other targets when # but that causes errors in other targets when
# resulting .res files get referenced multiple times. # resulting .res files get referenced multiple times.
'<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strings.rc', '<(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)/ui/ui_resources/ui_unscaled_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
], ],
'link_settings': { 'link_settings': {
'libraries': [ 'libraries': [
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment