Refactor skia_warnings_as_errors

Refactor skia_warnings_as_errors
Committed: https://code.google.com/p/skia/source/detail?r=8330

[djsollen, 2013-03-20 17:43:29]

https://codereview.chromium.org/12963002/diff/1/gyp/common_variables.gypi
File gyp/common_variables.gypi (right):

https://codereview.chromium.org/12963002/diff/1/gyp/common_variables.gypi#new...
gyp/common_variables.gypi:99: [ 'skia_os in ["linux", "freebsd", "openbsd",
"solaris"]', {
why not put android and ios in this list?

https://codereview.chromium.org/12963002/diff/1/gyp/jsoncpp.gyp
File gyp/jsoncpp.gyp (right):

https://codereview.chromium.org/12963002/diff/1/gyp/jsoncpp.gyp#newcode56
gyp/jsoncpp.gyp:56: [ 'skia_warnings_as_errors', {
is there a better way than listing these out each time?

[borenet, 2013-03-20 19:19:34]

https://codereview.chromium.org/12963002/diff/1/gyp/common_variables.gypi
File gyp/common_variables.gypi (right):

https://codereview.chromium.org/12963002/diff/1/gyp/common_variables.gypi#new...
gyp/common_variables.gypi:99: [ 'skia_os in ["linux", "freebsd", "openbsd",
"solaris"]', {
On 2013/03/20 17:43:29, djsollen wrote:
> why not put android and ios in this list?

Combined into one condition.  It was necessary for the "else" condition, which
would have been very complicated otherwise.

https://codereview.chromium.org/12963002/diff/1/gyp/jsoncpp.gyp
File gyp/jsoncpp.gyp (right):

https://codereview.chromium.org/12963002/diff/1/gyp/jsoncpp.gyp#newcode56
gyp/jsoncpp.gyp:56: [ 'skia_warnings_as_errors', {
On 2013/03/20 17:43:29, djsollen wrote:
> is there a better way than listing these out each time?

I combined android into the linux set, but since mac and win require different
exclusions, AFAIK there's not really another good way.

https://codereview.chromium.org/12963002/diff/14001/gyp/libjpeg.gyp
File gyp/libjpeg.gyp (left):

https://codereview.chromium.org/12963002/diff/14001/gyp/libjpeg.gyp#oldcode104
gyp/libjpeg.gyp:104: ['OS=="android"', {
We're in a !android section here, so this has no effect. Removed.

[djsollen, 2013-03-20 19:29:06]

https://codereview.chromium.org/12963002/diff/2007/gyp/jsoncpp.gyp
File gyp/jsoncpp.gyp (right):

https://codereview.chromium.org/12963002/diff/2007/gyp/jsoncpp.gyp#newcode55
gyp/jsoncpp.gyp:55: # Turn off warnings as errors.
What do you think of putting this in a gypi and calling something like.

'include': [ 'utils/disable_warnings_as_errors.gypi]

[borenet, 2013-03-20 20:02:50]

Patch set 5.

https://codereview.chromium.org/12963002/diff/2007/gyp/jsoncpp.gyp
File gyp/jsoncpp.gyp (right):

https://codereview.chromium.org/12963002/diff/2007/gyp/jsoncpp.gyp#newcode55
gyp/jsoncpp.gyp:55: # Turn off warnings as errors.
On 2013/03/20 19:29:07, djsollen wrote:
> What do you think of putting this in a gypi and calling something like.
> 
> 'include': [ 'utils/disable_warnings_as_errors.gypi]

I like it! Done.

[djsollen, 2013-03-20 20:06:34]

lgtm

[borenet, 2013-03-21 20:49:56]

cc bsalomon@ for merge issues.

[borenet, 2013-03-21 22:32:18]

New approach at patch set 9.

https://codereview.chromium.org/12963002/diff/57001/gyp/cityhash.gyp
File gyp/cityhash.gyp (right):

https://codereview.chromium.org/12963002/diff/57001/gyp/cityhash.gyp#newcode1
gyp/cityhash.gyp:1: {
Moved from utils.gyp.

[borenet, 2013-03-22 12:03:04]

On 2013/03/21 22:32:18, borenet wrote:
> New approach at patch set 9.
> 
> https://codereview.chromium.org/12963002/diff/57001/gyp/cityhash.gyp
> File gyp/cityhash.gyp (right):
> 
> https://codereview.chromium.org/12963002/diff/57001/gyp/cityhash.gyp#newcode1
> gyp/cityhash.gyp:1: {
> Moved from utils.gyp.

The Linux trybot failure is due to an upload problem.  I will submit a fix for
Android immediately after this change.  PTAL at patch set 9.

[borenet, 2013-03-22 12:07:55]

On 2013/03/22 12:03:04, borenet wrote:
> On 2013/03/21 22:32:18, borenet wrote:
> > New approach at patch set 9.
> > 
> > https://codereview.chromium.org/12963002/diff/57001/gyp/cityhash.gyp
> > File gyp/cityhash.gyp (right):
> > 
> >
https://codereview.chromium.org/12963002/diff/57001/gyp/cityhash.gyp#newcode1
> > gyp/cityhash.gyp:1: {
> > Moved from utils.gyp.
> 
> The Linux trybot failure is due to an upload problem.  I will submit a fix for
> Android immediately after this change.  PTAL at patch set 9.

Fix for Android failure: https://codereview.chromium.org/12702024/

[bsalomon, 2013-03-22 13:10:06]

lgtm

[borenet, 2013-03-22 13:16:15]

Committed patchset #9 manually as r8330 (presubmit successful).