| Index: chrome/chrome_dll.gypi
|
| diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
|
| index 7c831d3d2b86e732f514334fc53f576df63b4b83..9f6701a9d3d61b56ea69fb64458d380e9a3da7c3 100644
|
| --- a/chrome/chrome_dll.gypi
|
| +++ b/chrome/chrome_dll.gypi
|
| @@ -102,15 +102,11 @@
|
| # On Windows, link the dependencies (libraries) that make
|
| # up actual Chromium functionality into this .dll.
|
| 'chrome_dll_pdb_workaround',
|
| - 'chrome_resources.gyp:chrome_resources',
|
| 'chrome_version_resources',
|
| - '../chrome/chrome_resources.gyp:chrome_unscaled_resources',
|
| '../crypto/crypto.gyp:crypto',
|
| '../printing/printing.gyp:printing',
|
| - '../net/net.gyp:net_resources',
|
| '../third_party/cld/cld.gyp:cld',
|
| '../ui/views/views.gyp:views',
|
| - '../webkit/webkit_resources.gyp:webkit_resources',
|
| ],
|
| 'sources': [
|
| 'app/chrome_command_ids.h',
|
| @@ -134,21 +130,6 @@
|
| '../ui/resources/cursors/vertical_text.cur',
|
| '../ui/resources/cursors/zoom_in.cur',
|
| '../ui/resources/cursors/zoom_out.cur',
|
| -
|
| - # 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.
|
| - '<(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)/content/content_resources.rc',
|
| - '<(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',
|
| ],
|
| 'include_dirs': [
|
| '<(DEPTH)/third_party/wtl/include',
|
| @@ -364,8 +345,6 @@
|
| 'CHROME_MULTIPLE_DLL_CHILD',
|
| ],
|
| 'sources': [
|
| - '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
|
| - '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
|
| '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc',
|
| 'app/chrome_main.cc',
|
| 'app/chrome_main_delegate.cc',
|
|
|