diff options
| author | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-26 16:35:04 +0000 |
|---|---|---|
| committer | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-26 16:35:04 +0000 |
| commit | 3dcdd99a2adabb9fbbb8dca0abd3675e99c8ca3d (patch) | |
| tree | 1fe78dfb6a966cdb672f383d8aa3dd662a3f7425 /chrome/chrome_exe.gypi | |
| parent | 4ea09f19e7e3223022ddc8023679a39c6be9d72d (diff) | |
| download | chromium_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/chrome_exe.gypi')
| -rw-r--r-- | chrome/chrome_exe.gypi | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index d24b3f5..aa4c491 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -182,7 +182,6 @@ # Needed for chrome_main.cc initialization of libraries. '../build/linux/system.gyp:dbus-glib', '../build/linux/system.gyp:gtk', - 'packed_resources', # Needed to use the master_preferences functions 'installer_util', ], @@ -443,6 +442,7 @@ ], 'dependencies': [ 'packed_extra_resources', + 'packed_resources', # Copy Flash Player files to PRODUCT_DIR if applicable. Let the .gyp # file decide what to do on a per-OS basis; on Mac, internal plugins # go inside the framework, so this dependency is in chrome_dll.gypi. @@ -479,7 +479,6 @@ '../breakpad/breakpad.gyp:breakpad_handler', '../breakpad/breakpad.gyp:breakpad_sender', '../sandbox/sandbox.gyp:sandbox', - 'app/locales/locales.gyp:*', 'app/policy/cloud_policy_codegen.gyp:policy', ], 'sources': [ |