summaryrefslogtreecommitdiffstats
path: root/chrome_frame/chrome_frame.gyp
diff options
context:
space:
mode:
authorbattre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-26 16:35:04 +0000
committerbattre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-26 16:35:04 +0000
commit3dcdd99a2adabb9fbbb8dca0abd3675e99c8ca3d (patch)
tree1fe78dfb6a966cdb672f383d8aa3dd662a3f7425 /chrome_frame/chrome_frame.gyp
parent4ea09f19e7e3223022ddc8023679a39c6be9d72d (diff)
downloadchromium_src-3dcdd99a2adabb9fbbb8dca0abd3675e99c8ca3d.zip
chromium_src-3dcdd99a2adabb9fbbb8dca0abd3675e99c8ca3d.tar.gz
chromium_src-3dcdd99a2adabb9fbbb8dca0abd3675e99c8ca3d.tar.bz2
Revert 98426 - Revert 98103 - Switch to using .pak files for locale data on Windows.
We were using .dlls, but the .pak files are smaller and this will allow us to share more code across platforms. - Remove app/locales.gyp (used on win to generate the locale dlls) and references to it in other gyp(i) files. - Update various packaging scripts. - Move functions from resource_bundle_posix.cc to resource_bundle.cc (LoadResourcesDataPak, UnloadLocaleResources, GetLocalizedString, LoadLocaleResources) and delete the corresponding functions from resource_bundle_win.cc. Fixes from previous patch: - Made dependencies of packed_resources explicit (MSVS can't figure it out from the inputs). - Removed a couple cases where we were looking for dlls on Windows (in l10n_util.cc and l10n_util_unittest.cc). BUG=92724 TBR=cpu Review URL: http://codereview.chromium.org/7714028 TBR=tony@chromium.org Review URL: http://codereview.chromium.org/7744053 TBR=battre@chromium.org Review URL: http://codereview.chromium.org/7759001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98427 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame.gyp')
-rw-r--r--chrome_frame/chrome_frame.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index 2c42b87..47154cf 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -32,9 +32,9 @@
'target_defaults': {
'dependencies': [
# locales need to be built for the chrome frame binaries to be loadable.
- '../chrome/app/locales/locales.gyp:*',
'../chrome/chrome.gyp:chrome_resources',
'../chrome/chrome.gyp:chrome_strings',
+ '../chrome/chrome.gyp:packed_resources',
'../chrome/chrome.gyp:theme_resources',
'../skia/skia.gyp:skia',
],