Chromium Code Reviews| Index: build/common.gypi |
| diff --git a/build/common.gypi b/build/common.gypi |
| index a858b38ad6271930e1a6c4a47571e7095f18f811..0e83cba3354e0c39b364525c3d907a41759f012e 100644 |
| --- a/build/common.gypi |
| +++ b/build/common.gypi |
| @@ -935,17 +935,6 @@ |
| # Set to 1 to compile with the OpenGL ES 2.0 conformance tests. |
| 'internal_gles2_conform_tests%': 0, |
| - # NOTE: When these end up in the Mac bundle, we need to replace '-' for '_' |
|
tony
2013/03/11 17:55:14
Can we keep this list here and in the ios case, ov
|
| - # so Cocoa is happy (http://crbug.com/20441). |
| - 'locales': [ |
| - 'am', 'ar', 'bg', 'bn', 'ca', 'cs', 'da', 'de', 'el', 'en-GB', |
| - 'en-US', 'es-419', 'es', 'et', 'fa', 'fi', 'fil', 'fr', 'gu', 'he', |
| - 'hi', 'hr', 'hu', 'id', 'it', 'ja', 'kn', 'ko', 'lt', 'lv', |
| - 'ml', 'mr', 'ms', 'nb', 'nl', 'pl', 'pt-PT', 'ro', 'ru', |
| - 'sk', 'sl', 'sr', 'sv', 'sw', 'ta', 'te', 'th', 'tr', 'uk', |
| - 'vi', 'zh-CN', 'zh-TW', |
| - ], |
| - |
| # Pseudo locales are special locales which are used for testing and |
| # debugging. They don't get copied to the final app. For more info, |
| # check out https://sites.google.com/a/chromium.org/dev/Home/fake-bidi |
| @@ -1006,6 +995,25 @@ |
| 'enable_rlz%': 0, |
| 'conditions': [ |
| + ['OS!="ios"', { |
| + # NOTE: When these end up in the Mac bundle, we need to replace |
| + # '-' for '_' so Cocoa is happy (http://crbug.com/20441). |
| + 'locales': [ |
| + 'am', 'ar', 'bg', 'bn', 'ca', 'cs', 'da', 'de', 'el', 'en-GB', |
| + 'en-US', 'es-419', 'es', 'et', 'fa', 'fi', 'fil', 'fr', 'gu', 'he', |
| + 'hi', 'hr', 'hu', 'id', 'it', 'ja', 'kn', 'ko', 'lt', 'lv', |
| + 'ml', 'mr', 'ms', 'nb', 'nl', 'pl', 'pt-BR', 'pt-PT', 'ro', 'ru', |
| + 'sk', 'sl', 'sr', 'sv', 'sw', 'ta', 'te', 'th', 'tr', 'uk', |
| + 'vi', 'zh-CN', 'zh-TW', |
| + ], |
| + }, { # OS=="ios" |
| + 'locales': [ |
| + 'ar', 'ca', 'cs', 'da', 'de', 'el', 'en-GB', 'en-US', 'es', 'fi', |
| + 'fr', 'he', 'hr', 'hu', 'id', 'it', 'ja', 'ko', 'ms', 'nl', 'pl', |
| + 'pt', 'pt-PT', 'ro', 'ru', 'sk', 'sv', 'th', 'tr', 'uk', 'vi', |
| + 'zh-CN', 'zh-TW', |
| + ], |
| + }], |
| ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(windows_sdk_default_path))"=="True"', { |
| 'windows_sdk_path%': '<(windows_sdk_default_path)', |
| }, { |
| @@ -1416,10 +1424,6 @@ |
| # iOS uses a whitelist to filter resources. |
| '-w', '<(DEPTH)/build/ios/grit_whitelist.txt' |
| ], |
| - # iOS uses pt instead of pt-BR. |
| - 'locales': ['pt'], |
| - }, { # OS != "ios" |
| - 'locales': ['pt-BR'], |
| }], |
| ['enable_extensions==1', { |
| 'grit_defines': ['-D', 'enable_extensions'], |