Commit 7e52ea6b authored by tony@chromium.org's avatar tony@chromium.org

Generate locale dlls as a dependency of Chrome Frame.

Chrome frame has dialogs in generated_resources.grd that are
not included in the pak files.  They should continue to use the
locale dlls.

BUG=94362

Review URL: http://codereview.chromium.org/7760002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98449 0039d316-1c4b-4281-b951-d872f2087c98
parent cf9f2ee2
...@@ -1610,10 +1610,14 @@ ...@@ -1610,10 +1610,14 @@
'default_plugin/default_plugin.gyp:default_plugin_resources', 'default_plugin/default_plugin.gyp:default_plugin_resources',
'platform_locale_settings', 'platform_locale_settings',
'theme_resources', 'theme_resources',
'theme_resources_standard',
'theme_resources_large',
'<(DEPTH)/net/net.gyp:net_resources', '<(DEPTH)/net/net.gyp:net_resources',
'<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings', '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',
'<(DEPTH)/ui/ui.gyp:gfx_resources', '<(DEPTH)/ui/ui.gyp:gfx_resources',
'<(DEPTH)/ui/ui.gyp:ui_resources', '<(DEPTH)/ui/ui.gyp:ui_resources',
'<(DEPTH)/ui/ui.gyp:ui_resources_large',
'<(DEPTH)/ui/ui.gyp:ui_resources_standard',
'<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources', '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
'<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings', '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',
], ],
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
'target_defaults': { 'target_defaults': {
'dependencies': [ 'dependencies': [
# locales need to be built for the chrome frame binaries to be loadable. # locales need to be built for the chrome frame binaries to be loadable.
'locales/locales.gyp:*',
'../chrome/chrome.gyp:chrome_resources', '../chrome/chrome.gyp:chrome_resources',
'../chrome/chrome.gyp:chrome_strings', '../chrome/chrome.gyp:chrome_strings',
'../chrome/chrome.gyp:packed_resources', '../chrome/chrome.gyp:packed_resources',
......
This diff is collapsed.
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