diff options
| author | olivierrobin <olivierrobin@chromium.org> | 2015-02-09 09:04:57 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-09 17:05:22 +0000 |
| commit | 2310fc2b85b31504de87ba22d9d14fc406ed3147 (patch) | |
| tree | 5b8222484f6cfe4d49d1e7c47c268b3115aed180 /ios | |
| parent | 8a822d0b1f720c95d71b62b3b4c3c6e5bd014b43 (diff) | |
| download | chromium_src-2310fc2b85b31504de87ba22d9d14fc406ed3147.zip chromium_src-2310fc2b85b31504de87ba22d9d14fc406ed3147.tar.gz chromium_src-2310fc2b85b31504de87ba22d9d14fc406ed3147.tar.bz2 | |
Change grit whitelist to a string parameter
This CL changes the grit_whitelist parameter to be a string instead of a
part of grit_defines.
This allow user to override the parameter with another file.
The goal of this is to allow creating bundles with their own whitelists.
At the moment, if you want to create a small executable (i.e. an ios extension)
that only uses 3 strings, you are required to include all the strings
whitelisted by the main chrome bundle.
By allowing to override the whitelist argument (instead of only appending the
argument array, it will allow to specify a specific whitelist for a specific
target.
BUG=456837
Review URL: https://codereview.chromium.org/862043002
Cr-Commit-Position: refs/heads/master@{#315324}
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/chrome/ios_chrome_resources.gyp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ios/chrome/ios_chrome_resources.gyp b/ios/chrome/ios_chrome_resources.gyp index 8f77088..1e92fc2 100644 --- a/ios/chrome/ios_chrome_resources.gyp +++ b/ios/chrome/ios_chrome_resources.gyp @@ -7,10 +7,8 @@ 'chromium_code': 1, 'grit_base_dir': '<(SHARED_INTERMEDIATE_DIR)', 'grit_out_dir': '<(grit_base_dir)/ios/chrome', - 'grit_defines': [ - # TODO(lliabraa): Remove this whitelist. - '-w', '<(DEPTH)/ios/build/grit_whitelist.txt', - ], + # TODO(lliabraa): Remove this whitelist. + 'grit_whitelist': '<(DEPTH)/ios/build/grit_whitelist.txt', }, 'targets': [ { |