diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-26 23:08:18 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-26 23:08:18 +0000 |
| commit | 6624610ce6dff8cf77bc4161d5f2c089c0f4cf30 (patch) | |
| tree | 8bdcf4fda57a863f1b8fe23f463037c9c1c2d248 /chrome_frame/chrome_frame.gyp | |
| parent | 294a6fa775b0a49fb020e3365474ee5d72f49adb (diff) | |
| download | chromium_src-6624610ce6dff8cf77bc4161d5f2c089c0f4cf30.zip chromium_src-6624610ce6dff8cf77bc4161d5f2c089c0f4cf30.tar.gz chromium_src-6624610ce6dff8cf77bc4161d5f2c089c0f4cf30.tar.bz2 | |
Only put the chrome frame resources in the locale dlls.
Chrome Frame needs 2 dialogs and an icon in the locale dlls. The
rest of the strings and resources can be pulled from the locale
pak files.
This also removes the icon from the pak files and moves them into the
dlls.
BUG=94362
Review URL: http://codereview.chromium.org/7766007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98513 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame.gyp')
| -rw-r--r-- | chrome_frame/chrome_frame.gyp | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index 63862cd..c772913 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -31,8 +31,6 @@ }, 'target_defaults': { 'dependencies': [ - # 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_strings', '../chrome/chrome.gyp:packed_resources', @@ -85,6 +83,7 @@ 'chrome_frame_ie', 'chrome_frame_strings', 'chrome_tab_idl', + 'locales/locales.gyp:*', ], 'sources': [ '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', @@ -205,6 +204,7 @@ 'chrome_frame_strings', 'chrome_frame_utils', 'chrome_tab_idl', + 'locales/locales.gyp:*', 'npchrome_frame', ], 'sources': [ @@ -311,6 +311,7 @@ 'chrome_frame_strings', 'chrome_frame_utils', 'chrome_tab_idl', + 'locales/locales.gyp:*', 'npchrome_frame', ], 'sources': [ @@ -464,6 +465,7 @@ 'chrome_frame_ie', 'chrome_frame_strings', 'chrome_tab_idl', + 'locales/locales.gyp:*', ], 'sources': [ 'test/reliability/run_all_unittests.cc', @@ -532,6 +534,7 @@ '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', 'chrome_frame_ie', 'chrome_frame_strings', + 'locales/locales.gyp:*', 'npchrome_frame', ], 'sources': [ @@ -600,6 +603,13 @@ }, 'includes': [ '../build/grit_action.gypi' ], }, + { + 'action_name': 'chrome_frame_dialogs', + 'variables': { + 'grit_grd_file': 'resources/chrome_frame_dialogs.grd', + }, + 'includes': [ '../build/grit_action.gypi' ], + }, ], 'includes': [ '../build/grit_target.gypi' ], }, @@ -631,6 +641,7 @@ 'chrome_frame_strings', 'chrome_frame_utils', 'chrome_tab_idl', + 'locales/locales.gyp:*', '../build/temp_gyp/googleurl.gyp:googleurl', '../chrome/app/policy/cloud_policy_codegen.gyp:policy', '../chrome/chrome.gyp:common', @@ -829,9 +840,10 @@ 'chrome_frame_utils', 'chrome_tab_idl', 'chrome_frame_launcher.gyp:chrome_launcher', - '../build/temp_gyp/googleurl.gyp:googleurl', 'chrome_frame_launcher.gyp:chrome_frame_helper', 'chrome_frame_launcher.gyp:chrome_frame_helper_dll', + 'locales/locales.gyp:*', + '../build/temp_gyp/googleurl.gyp:googleurl', '../chrome/chrome.gyp:chrome', '../chrome/chrome.gyp:chrome_dll', '../chrome/chrome.gyp:chrome_version_resources', |