diff options
| author | sdefresne <sdefresne@chromium.org> | 2015-12-09 08:37:44 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-09 16:38:33 +0000 |
| commit | 32aa7b67dadee74d6e89bd93682354cced97e06c (patch) | |
| tree | f306335ed48d57bff440032fcf612ea1649389a9 /ios | |
| parent | 1b300bd1042cfd67f90a779e65fa535368d8fdab (diff) | |
| download | chromium_src-32aa7b67dadee74d6e89bd93682354cced97e06c.zip chromium_src-32aa7b67dadee74d6e89bd93682354cced97e06c.tar.gz chromium_src-32aa7b67dadee74d6e89bd93682354cced97e06c.tar.bz2 | |
Remove default whitelist for grit on iOS.
Clear the default value in build/common.gypi and remove overrides in
.gyp files. Leave support for whitelisting in grit_action.gypi as it
is still used downstream and on android.
BUG=548645
Review URL: https://codereview.chromium.org/1489403004
Cr-Commit-Position: refs/heads/master@{#364078}
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/chrome/ios_chrome_resources.gyp | 5 | ||||
| -rw-r--r-- | ios/chrome/ios_today_extension_resources.gyp | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/ios/chrome/ios_chrome_resources.gyp b/ios/chrome/ios_chrome_resources.gyp index d085be8..7c81ea0 100644 --- a/ios/chrome/ios_chrome_resources.gyp +++ b/ios/chrome/ios_chrome_resources.gyp @@ -49,7 +49,6 @@ # GN version: //ios/chrome/app/strings:ios_locale_settings 'action_name': 'generate_ios_locale_settings', 'variables': { - 'grit_whitelist': '', 'grit_grd_file': 'app/strings/ios_locale_settings.grd', }, 'includes': [ '../../build/grit_action.gypi' ], @@ -58,7 +57,6 @@ # GN version: //ios/chrome/app/strings:ios_strings 'action_name': 'generate_ios_strings', 'variables': { - 'grit_whitelist': '', 'grit_grd_file': 'app/strings/ios_strings.grd', }, 'includes': [ '../../build/grit_action.gypi' ], @@ -67,7 +65,6 @@ # GN version: //ios/chrome/app/strings:ios_chromium_strings 'action_name': 'generate_ios_chromium_strings', 'variables': { - 'grit_whitelist': '', 'grit_grd_file': 'app/strings/ios_chromium_strings.grd', }, 'includes': [ '../../build/grit_action.gypi' ], @@ -76,7 +73,6 @@ # GN version: //ios/chrome/app/strings:ios_google_chrome_strings 'action_name': 'generate_ios_google_chrome_strings', 'variables': { - 'grit_whitelist': '', 'grit_grd_file': 'app/strings/ios_google_chrome_strings.grd', }, 'includes': [ '../../build/grit_action.gypi' ], @@ -104,7 +100,6 @@ { 'action_name': 'ios_theme_resources', 'variables': { - 'grit_whitelist': '', 'grit_grd_file': 'app/theme/ios_theme_resources.grd', }, 'includes': [ '../../build/grit_action.gypi' ], diff --git a/ios/chrome/ios_today_extension_resources.gyp b/ios/chrome/ios_today_extension_resources.gyp index 3af1d79..62b05a5 100644 --- a/ios/chrome/ios_today_extension_resources.gyp +++ b/ios/chrome/ios_today_extension_resources.gyp @@ -24,7 +24,6 @@ { 'action_name': 'generate_ios_today_extension_strings', 'variables': { - 'grit_whitelist': '', 'grit_grd_file': 'today_extension/strings/ios_today_extension_strings.grd', }, 'includes': [ '../../build/grit_action.gypi' ], |