diff options
| -rw-r--r-- | components/components_tests.gyp | 10 | ||||
| -rw-r--r-- | content/browser/gpu/test_support_gpu.gypi | 1 | ||||
| -rw-r--r-- | content/content_tests.gypi | 10 | ||||
| -rw-r--r-- | net/BUILD.gn | 1 | ||||
| -rw-r--r-- | net/base/net_resources.grd | 1 |
5 files changed, 8 insertions, 15 deletions
diff --git a/components/components_tests.gyp b/components/components_tests.gyp index d5f78fe..d29f552 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -1469,14 +1469,12 @@ '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 (net.gyp:net_resources, etc.), - # but that causes errors in other targets when - # resulting .res files get referenced multiple times. + # 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)/blink/public/resources/blink_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_en-US.rc', - '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', ], 'dependencies': [ '<(DEPTH)/content/app/resources/content_resources.gyp:content_resources', diff --git a/content/browser/gpu/test_support_gpu.gypi b/content/browser/gpu/test_support_gpu.gypi index 9813377..5a9356e 100644 --- a/content/browser/gpu/test_support_gpu.gypi +++ b/content/browser/gpu/test_support_gpu.gypi @@ -28,7 +28,6 @@ 'sources': [ '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', ], 'conditions': [ ['win_use_allocator_shim==1', { diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 3b90118..766554f 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -1450,14 +1450,12 @@ ], 'sources': [ '<@(content_browsertests_win_sources)', - # TODO: It would be nice to have these pulled in - # automatically from direct_dependent_settings in - # their various targets (net.gyp:net_resources, etc.), - # but that causes errors in other targets when - # resulting .res files get referenced multiple times. + # 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)/blink/public/resources/blink_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_en-US.rc', - '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 'shell/app/resource.h', 'shell/app/shell.rc', ], diff --git a/net/BUILD.gn b/net/BUILD.gn index 18f5fe0..823d869 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn @@ -522,7 +522,6 @@ grit("net_resources") { outputs = [ "grit/net_resources.h", "net_resources.pak", - "net_resources.rc", ] } diff --git a/net/base/net_resources.grd b/net/base/net_resources.grd index 327778a..fef4e69 100644 --- a/net/base/net_resources.grd +++ b/net/base/net_resources.grd @@ -5,7 +5,6 @@ <emit emit_type='prepend'></emit> </output> <output filename="net_resources.pak" type="data_package" /> - <output filename="net_resources.rc" type="rc_all" /> </outputs> <translations /> <release seq="1"> |