OLD | NEW |
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 # TODO: This file was copied from the external dependency | 5 # TODO: This file was copied from the external dependency |
6 # third_party/externals/jsoncpp-chromium/jsoncpp.gyp , at revision 125399, | 6 # third_party/externals/jsoncpp-chromium/jsoncpp.gyp , at revision 125399, |
7 # with directory paths modified to work at this level. | 7 # with directory paths modified to work at this level. |
8 # | 8 # |
9 # It would be better for us to depend on that gypfile within the external | 9 # It would be better for us to depend on that gypfile within the external |
10 # dependency, but so far we have been unable to make that work reliably. | 10 # dependency, but so far we have been unable to make that work reliably. |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 'WarnAsError': 'false', | 60 'WarnAsError': 'false', |
61 }, | 61 }, |
62 }, | 62 }, |
63 }], | 63 }], |
64 [ 'skia_os == "android"', { | 64 [ 'skia_os == "android"', { |
65 'cflags!': [ | 65 'cflags!': [ |
66 '-Wall', | 66 '-Wall', |
67 '-Werror', | 67 '-Werror', |
68 ], | 68 ], |
69 }], | 69 }], |
| 70 ['skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', { |
| 71 'cflags!': [ |
| 72 '-Werror', |
| 73 ], |
| 74 }], |
70 ], | 75 ], |
71 }, | 76 }, |
72 ], | 77 ], |
73 } | 78 } |
74 | 79 |
75 # Local Variables: | 80 # Local Variables: |
76 # tab-width:2 | 81 # tab-width:2 |
77 # indent-tabs-mode:nil | 82 # indent-tabs-mode:nil |
78 # End: | 83 # End: |
79 # vim: set expandtab tabstop=2 shiftwidth=2: | 84 # vim: set expandtab tabstop=2 shiftwidth=2: |
OLD | NEW |