diff options
| author | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-07 23:18:56 +0000 |
|---|---|---|
| committer | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-07 23:18:56 +0000 |
| commit | 9ebe31d0325e34af439e4532e1dd79b9487ac8e0 (patch) | |
| tree | dbafe0f655133ef10175a35018499824d6930a0b /ui/base/strings | |
| parent | 2d1fd194de5fd8a162429c4965713316f5756ede (diff) | |
| download | chromium_src-9ebe31d0325e34af439e4532e1dd79b9487ac8e0.zip chromium_src-9ebe31d0325e34af439e4532e1dd79b9487ac8e0.tar.gz chromium_src-9ebe31d0325e34af439e4532e1dd79b9487ac8e0.tar.bz2 | |
Enable ResourceBundle unittests on iOS.
The ResourceBundle unittests previously failed on iOS because they expected a
locale.pak file to exist in the bundle for English-US, and no such locale.pak
file existed. Fix this problem by extending the
ui_strings.gyp:ui_unittest_strings target, which solves a similar problem for
other platforms, to solve this problem for iOS as well.
Review URL: https://chromiumcodereview.appspot.com/11361126
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166544 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/strings')
| -rw-r--r-- | ui/base/strings/ui_strings.gyp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/ui/base/strings/ui_strings.gyp b/ui/base/strings/ui_strings.gyp index 2ac5d00..d149a21 100644 --- a/ui/base/strings/ui_strings.gyp +++ b/ui/base/strings/ui_strings.gyp @@ -40,6 +40,13 @@ 'type': 'none', 'variables': { 'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py', + 'conditions': [ + ['OS == "ios"', { + 'pak_output': '<(PRODUCT_DIR)/ui_unittests_strings/en.lproj/locale.pak', + }, { + 'pak_output': '<(PRODUCT_DIR)/ui_unittests_strings/en-US.pak', + }], + ], }, 'actions': [ { @@ -55,7 +62,7 @@ '<@(pak_inputs)', ], 'outputs': [ - '<(PRODUCT_DIR)/ui_unittests_strings/en-US.pak', + '<(pak_output)', ], 'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'], |