summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2015-08-12 10:38:49 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-12 17:39:54 +0000
commit1d64bc0ee6bfaa2455060a14cb5b529aa0a389fd (patch)
tree4b3c729daeb2f9bf8b610af1fea2678351d8532f
parentefeafc2088660315cad63961e851160c5816e028 (diff)
downloadchromium_src-1d64bc0ee6bfaa2455060a14cb5b529aa0a389fd.zip
chromium_src-1d64bc0ee6bfaa2455060a14cb5b529aa0a389fd.tar.gz
chromium_src-1d64bc0ee6bfaa2455060a14cb5b529aa0a389fd.tar.bz2
Remove unused content .rc files.
These were generated and referenced in a few places but seem not to be used. In the GN build such generated .rc files are always compiled and linked, which resulted in duplicate resources. Review URL: https://codereview.chromium.org/1289883002 Cr-Commit-Position: refs/heads/master@{#343045}
-rw-r--r--chromecast/app/BUILD.gn1
-rw-r--r--chromecast/app/resources/shell_resources.grd1
-rw-r--r--components/components_tests.gyp5
-rw-r--r--content/BUILD.gn1
-rw-r--r--content/app/strings/BUILD.gn1
-rw-r--r--content/app/strings/content_strings.grd3
-rw-r--r--content/browser/gpu/test_support_gpu.gypi3
-rw-r--r--content/content_resources.grd1
-rw-r--r--content/content_tests.gypi5
-rw-r--r--content/shell/BUILD.gn1
-rw-r--r--content/shell/shell_resources.grd1
11 files changed, 0 insertions, 23 deletions
diff --git a/chromecast/app/BUILD.gn b/chromecast/app/BUILD.gn
index d1a69e2..7b0732d 100644
--- a/chromecast/app/BUILD.gn
+++ b/chromecast/app/BUILD.gn
@@ -71,7 +71,6 @@ grit("resources") {
outputs = [
"grit/shell_resources.h",
"shell_resources.pak",
- "shell_resources.rc",
]
}
diff --git a/chromecast/app/resources/shell_resources.grd b/chromecast/app/resources/shell_resources.grd
index 9d4c322..40b5cea 100644
--- a/chromecast/app/resources/shell_resources.grd
+++ b/chromecast/app/resources/shell_resources.grd
@@ -5,7 +5,6 @@
<emit emit_type='prepend'></emit>
</output>
<output filename="shell_resources.pak" type="data_package" />
- <output filename="shell_resources.rc" type="rc_all" />
</outputs>
<translations />
<release seq="1">
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 37f7685..352987b 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -1470,11 +1470,6 @@
'sources': [
'../content/shell/app/resource.h',
'../content/shell/app/shell.rc',
- # TODO: It would be nice to have these pulled in automatically
- # from direct_dependent_settings in their various targets, but
- # that causes errors in other targets when resulting .res files
- # get referenced multiple times.
- '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_en-US.rc',
],
'dependencies': [
'<(DEPTH)/content/app/resources/content_resources.gyp:content_resources',
diff --git a/content/BUILD.gn b/content/BUILD.gn
index fffa8ef..7909e7f 100644
--- a/content/BUILD.gn
+++ b/content/BUILD.gn
@@ -68,7 +68,6 @@ grit("resources") {
outputs = [
"grit/content_resources.h",
"content_resources.pak",
- "content_resources.rc",
]
}
diff --git a/content/app/strings/BUILD.gn b/content/app/strings/BUILD.gn
index c0dafd09..2cd3e76 100644
--- a/content/app/strings/BUILD.gn
+++ b/content/app/strings/BUILD.gn
@@ -10,7 +10,6 @@ grit("strings") {
source = "content_strings.grd"
outputs = [
"grit/content_strings.h",
- "content_strings_en-US.rc",
"content_strings_am.pak",
"content_strings_ar.pak",
"content_strings_bg.pak",
diff --git a/content/app/strings/content_strings.grd b/content/app/strings/content_strings.grd
index 450ecc3..9bc98e6 100644
--- a/content/app/strings/content_strings.grd
+++ b/content/app/strings/content_strings.grd
@@ -45,9 +45,6 @@ below:
<output filename="grit/content_strings.h" type="rc_header">
<emit emit_type='prepend'></emit>
</output>
- <!-- TODO(tony): Get rid of this .rc file. -->
- <output filename="content_strings_en-US.rc" type="rc_all" lang="en" />
-
<output filename="content_strings_am.pak" type="data_package" lang="am" />
<output filename="content_strings_ar.pak" type="data_package" lang="ar" />
<if expr="use_third_party_translations">
diff --git a/content/browser/gpu/test_support_gpu.gypi b/content/browser/gpu/test_support_gpu.gypi
index e531cfb..7c4beaa 100644
--- a/content/browser/gpu/test_support_gpu.gypi
+++ b/content/browser/gpu/test_support_gpu.gypi
@@ -25,9 +25,6 @@
'include_dirs': [
'<(DEPTH)/third_party/wtl/include',
],
- 'sources': [
- '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
- ],
'conditions': [
['win_use_allocator_shim==1', {
'dependencies': [
diff --git a/content/content_resources.grd b/content/content_resources.grd
index 09cfd99..7e87003 100644
--- a/content/content_resources.grd
+++ b/content/content_resources.grd
@@ -6,7 +6,6 @@
<emit emit_type='prepend'></emit>
</output>
<output filename="content_resources.pak" type="data_package" />
- <output filename="content_resources.rc" type="rc_all" />
</outputs>
<translations />
<release seq="1">
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index f77c44f..f5984a6 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -1450,11 +1450,6 @@
],
'sources': [
'<@(content_browsertests_win_sources)',
- # TODO: It would be nice to have these pulled in automatically
- # from direct_dependent_settings in their various targets but
- # that causes errors in other targets when resulting .res files
- # get referenced multiple times.
- '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_en-US.rc',
'shell/app/resource.h',
'shell/app/shell.rc',
],
diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn
index 126d1c7..91e8d28 100644
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -331,7 +331,6 @@ grit("content_shell_resources_grit") {
outputs = [
"grit/shell_resources.h",
"shell_resources.pak",
- "shell_resources.rc",
]
}
diff --git a/content/shell/shell_resources.grd b/content/shell/shell_resources.grd
index 67ce85b..bfb4071 100644
--- a/content/shell/shell_resources.grd
+++ b/content/shell/shell_resources.grd
@@ -5,7 +5,6 @@
<emit emit_type='prepend'></emit>
</output>
<output filename="shell_resources.pak" type="data_package" />
- <output filename="shell_resources.rc" type="rc_all" />
</outputs>
<translations />
<release seq="1">