diff options
| author | sdefresne <sdefresne@chromium.org> | 2015-09-24 03:48:08 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-24 10:49:01 +0000 |
| commit | 502be01eec9af4fa82ce8abe4f6470735288b5e4 (patch) | |
| tree | a5042079233907e46b0b393aad3cce11707390bf /build/secondary/tools | |
| parent | 108ec42a586fb542e3ec2bee6d4523402cacc4ad (diff) | |
| download | chromium_src-502be01eec9af4fa82ce8abe4f6470735288b5e4.zip chromium_src-502be01eec9af4fa82ce8abe4f6470735288b5e4.tar.gz chromium_src-502be01eec9af4fa82ce8abe4f6470735288b5e4.tar.bz2 | |
Improve iOS localisation and resource packing.
Stop using whitelisting for resources from components on the rationale
that it causes confusion for the developers and most of those resources
are used on iOS.
Stop support for whitelisting for resources when using gn as meta-build
system on the rationale that the migration will happen after Chrome on
iOS is unforked at which point whitelisting will not be used with gyp
either.
Update build/ios/grit_whitelist.txt to:
1. remove all resources from //components,
2. remove all resources that no longer exists,
3. add all resources used downstream (i.e. unfork the file).
TEST=Checked that clobber build compiled and all tests passed on both
the upstream and downstream tree with this CL.
BUG=429756
Review URL: https://codereview.chromium.org/1350453004
Cr-Commit-Position: refs/heads/master@{#350526}
Diffstat (limited to 'build/secondary/tools')
| -rw-r--r-- | build/secondary/tools/grit/grit_rule.gni | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/build/secondary/tools/grit/grit_rule.gni b/build/secondary/tools/grit/grit_rule.gni index 260cf8d..f5c08ea 100644 --- a/build/secondary/tools/grit/grit_rule.gni +++ b/build/secondary/tools/grit/grit_rule.gni @@ -188,10 +188,6 @@ if (is_ios) { grit_defines += [ "-t", "ios", - - # iOS uses a whitelist to filter resources. - "-w", - rebase_path("//build/ios/grit_whitelist.txt", root_build_dir), ] } |