| OLD | NEW |
| 1 # | 1 # |
| 2 # Copyright (C) 2013 Google Inc. All rights reserved. | 2 # Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 # | 3 # |
| 4 # Redistribution and use in source and binary forms, with or without | 4 # Redistribution and use in source and binary forms, with or without |
| 5 # modification, are permitted provided that the following conditions are | 5 # modification, are permitted provided that the following conditions are |
| 6 # met: | 6 # met: |
| 7 # | 7 # |
| 8 # * Redistributions of source code must retain the above copyright | 8 # * Redistributions of source code must retain the above copyright |
| 9 # notice, this list of conditions and the following disclaimer. | 9 # notice, this list of conditions and the following disclaimer. |
| 10 # * Redistributions in binary form must reproduce the above | 10 # * Redistributions in binary form must reproduce the above |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 ['gcc_version>=46', { | 82 ['gcc_version>=46', { |
| 83 # Disable warnings about c++0x compatibility, as some names (such as | 83 # Disable warnings about c++0x compatibility, as some names (such as |
| 84 # nullptr) conflict with upcoming c++0x types. | 84 # nullptr) conflict with upcoming c++0x types. |
| 85 'cflags_cc': ['-Wno-c++0x-compat'], | 85 'cflags_cc': ['-Wno-c++0x-compat'], |
| 86 }], | 86 }], |
| 87 ['OS=="linux" and target_arch=="arm"', { | 87 ['OS=="linux" and target_arch=="arm"', { |
| 88 # Due to a bug in gcc arm, we get warnings about uninitialized | 88 # Due to a bug in gcc arm, we get warnings about uninitialized |
| 89 # timesNewRoman.unstatic.3258 and colorTransparent.unstatic.4879. | 89 # timesNewRoman.unstatic.3258 and colorTransparent.unstatic.4879. |
| 90 'cflags': ['-Wno-uninitialized'], | 90 'cflags': ['-Wno-uninitialized'], |
| 91 }], | 91 }], |
| 92 ['OS=="mac"', { | 92 ['OS=="mac" or OS=="linux"', { |
| 93 # TODO: Turn this on on all platforms, http://crbug.com/312287 | 93 # TODO: Turn this on on all platforms, http://crbug.com/312287 |
| 94 'variables': { | 94 'variables': { |
| 95 'chromium_code': 1, | 95 'chromium_code': 1, |
| 96 }, | 96 }, |
| 97 }], | 97 }], |
| 98 ['clang==1', { | 98 ['clang==1', { |
| 99 'cflags': ['-Wglobal-constructors'], | 99 'cflags': ['-Wglobal-constructors'], |
| 100 'xcode_settings': { | 100 'xcode_settings': { |
| 101 'WARNING_CFLAGS': ['-Wglobal-constructors'], | 101 'WARNING_CFLAGS': ['-Wglobal-constructors'], |
| 102 }, | 102 }, |
| (...skipping 16 matching lines...) Expand all Loading... |
| 119 ], | 119 ], |
| 120 'direct_dependent_settings': { | 120 'direct_dependent_settings': { |
| 121 'cflags!': ['-Wglobal-constructors'], | 121 'cflags!': ['-Wglobal-constructors'], |
| 122 'xcode_settings': { | 122 'xcode_settings': { |
| 123 'WARNING_CFLAGS!': ['-Wglobal-constructors'], | 123 'WARNING_CFLAGS!': ['-Wglobal-constructors'], |
| 124 }, | 124 }, |
| 125 }, | 125 }, |
| 126 } | 126 } |
| 127 ], | 127 ], |
| 128 } | 128 } |
| OLD | NEW |