diff options
| author | tapted <tapted@chromium.org> | 2014-09-09 17:35:14 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-10 00:42:41 +0000 |
| commit | bac8fafd3d056f1277c2fdf44d2a66ca19252e54 (patch) | |
| tree | 7d46d0c9d6b9f63eb4505d2fcde1ad0b4924fde2 /ui/resources/ui_resources.gyp | |
| parent | 261bcb4031c572424b2e82e1b7919e1489576474 (diff) | |
| download | chromium_src-bac8fafd3d056f1277c2fdf44d2a66ca19252e54.zip chromium_src-bac8fafd3d056f1277c2fdf44d2a66ca19252e54.tar.gz chromium_src-bac8fafd3d056f1277c2fdf44d2a66ca19252e54.tar.bz2 | |
Simplify test locales in Mac's ui_unittests Framework
Mac creates a mini-framework in `ui_unittests Framework` so that ui
tests can get a resource bundle without depending on the Chrome
framework.
The way it generated locale information was causing build flakes since
two instances of repack_locales.py could be writing to
out/../gen/repack. Tests always use en-US, so instead just do what iOS
does and copy ui_test.pak to en.lproj/locale.pak and roll it into the
mini-framework bundle.
BUG=410468
Review URL: https://codereview.chromium.org/552963002
Cr-Commit-Position: refs/heads/master@{#294052}
Diffstat (limited to 'ui/resources/ui_resources.gyp')
| -rw-r--r-- | ui/resources/ui_resources.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/resources/ui_resources.gyp b/ui/resources/ui_resources.gyp index 089d0c4..6ef2bfc 100644 --- a/ui/resources/ui_resources.gyp +++ b/ui/resources/ui_resources.gyp @@ -74,7 +74,7 @@ }, ], }], - ['OS == "ios"', { + ['OS == "ios" or OS == "mac"', { 'actions': [ { # GN version: //ui/resources:copy_ui_test_pak |