summaryrefslogtreecommitdiffstats
path: root/build/common.gypi
diff options
context:
space:
mode:
authorsdefresne <sdefresne@chromium.org>2015-12-09 08:37:44 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-09 16:38:33 +0000
commit32aa7b67dadee74d6e89bd93682354cced97e06c (patch)
treef306335ed48d57bff440032fcf612ea1649389a9 /build/common.gypi
parent1b300bd1042cfd67f90a779e65fa535368d8fdab (diff)
downloadchromium_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 'build/common.gypi')
-rw-r--r--build/common.gypi3
1 files changed, 0 insertions, 3 deletions
diff --git a/build/common.gypi b/build/common.gypi
index f937328..157f446 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -2136,9 +2136,6 @@
'-t', 'ios',
'--no-output-all-resource-defines',
],
- # iOS uses a whitelist to filter resources.
- 'grit_whitelist%': '<(DEPTH)/build/ios/grit_whitelist.txt',
-
# Enable host builds when generating with ninja-ios.
'conditions': [
['"<(GENERATOR)"=="ninja"', {