diff options
| -rw-r--r-- | ui/base/strings/ui_strings.gyp | 9 | ||||
| -rw-r--r-- | ui/ui_unittests.gypi | 14 |
2 files changed, 20 insertions, 3 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)'], diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi index 1f405e7..185d928 100644 --- a/ui/ui_unittests.gypi +++ b/ui/ui_unittests.gypi @@ -68,6 +68,7 @@ 'base/models/tree_node_iterator_unittest.cc', 'base/resource/data_pack_literal.cc', 'base/resource/data_pack_unittest.cc', + 'base/resource/resource_bundle_unittest.cc', 'base/text/text_elider_unittest.cc', 'gfx/codec/png_codec_unittest.cc', 'gfx/color_utils_unittest.cc', @@ -116,7 +117,6 @@ 'base/range/range_mac_unittest.mm', 'base/range/range_unittest.cc', 'base/range/range_win_unittest.cc', - 'base/resource/resource_bundle_unittest.cc', 'base/test/data/resource.h', 'base/text/bytes_formatting_unittest.cc', 'base/text/utf16_indexing_unittest.cc', @@ -146,6 +146,12 @@ 'sources' : [ '<@(_common_sources)', ], + # The ResourceBundle unittest expects a locale.pak file to exist in + # the bundle for English-US. Copy it in from where it was generated + # by ui_strings.gyp:ui_unittest_strings. + 'mac_bundle_resources': [ + '<(PRODUCT_DIR)/ui_unittests_strings/en.lproj/locale.pak', + ], }], ['OS == "win"', { 'sources': [ @@ -200,11 +206,15 @@ '../testing/android/native_test.gyp:native_test_native_code', ], }], + ['use_glib == 1 or OS == "ios"', { + 'dependencies': [ + 'base/strings/ui_strings.gyp:ui_unittest_strings', + ], + }], ['use_glib == 1', { 'dependencies': [ '../build/linux/system.gyp:pangocairo', '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', - 'base/strings/ui_strings.gyp:ui_unittest_strings', ], 'conditions': [ ['linux_use_tcmalloc==1', { |