diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-20 01:01:12 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-20 01:01:12 +0000 |
| commit | 033346909ebf37cae8fb063d79f9e70e0ec056c6 (patch) | |
| tree | cca752667aa31b195a5b800203673a2580eddf52 /build | |
| parent | 6b4a26ec838a3cab2db63eac3f944e050792b5b7 (diff) | |
| download | chromium_src-033346909ebf37cae8fb063d79f9e70e0ec056c6.zip chromium_src-033346909ebf37cae8fb063d79f9e70e0ec056c6.tar.gz chromium_src-033346909ebf37cae8fb063d79f9e70e0ec056c6.tar.bz2 | |
Switch to using '-t ios' for grit
grit now supports passing '-t ios', which sets is_ios, and doesn't set
is_macosx (matching the semantics of gyp). All instances of
pp_ifdef('ios') change to is_ios, matching the syntax used by other
platforms.
Because this flips the setting of is_macosx for iOS, most places where
code looked at is_macosx also now look for is_ios. This CL errs on the
side of being behavior-preserving, adding is_ios checks in some places
where they probably aren't needed, to avoid accidental regressions.
In places where it's very obvious it's not needed, it hasn't been
added.
Also adds a missing is_ios to history.html, resolving drift from
not-yet-upstreamed changes.
BUG=227781
Review URL: https://chromiumcodereview.appspot.com/22600003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218386 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/build/common.gypi b/build/common.gypi index a1ad05d4..450b992 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -1576,8 +1576,7 @@ }], ['OS == "ios"', { 'grit_defines': [ - # define for iOS specific resources. - '-D', 'ios', + '-t', 'ios', # iOS uses a whitelist to filter resources. '-w', '<(DEPTH)/build/ios/grit_whitelist.txt' ], |