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 /ui/resources | |
| 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 'ui/resources')
| -rw-r--r-- | ui/resources/ui_resources.gyp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/ui/resources/ui_resources.gyp b/ui/resources/ui_resources.gyp index 71e3e64..60a93dbd 100644 --- a/ui/resources/ui_resources.gyp +++ b/ui/resources/ui_resources.gyp @@ -15,7 +15,6 @@ { 'action_name': 'ui_resources', 'variables': { - 'grit_whitelist': '', 'grit_grd_file': 'ui_resources.grd', }, 'includes': [ '../../build/grit_action.gypi' ], @@ -23,7 +22,6 @@ { 'action_name': 'webui_resources', 'variables': { - 'grit_whitelist': '', 'grit_grd_file': '../webui/resources/webui_resources.grd', }, 'includes': [ '../../build/grit_action.gypi' ], @@ -31,7 +29,6 @@ { 'action_name': 'ui_unscaled_resources', 'variables': { - 'grit_whitelist': '', 'grit_grd_file': 'ui_unscaled_resources.grd', }, 'includes': [ '../../build/grit_action.gypi' ], |