| 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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 # nullptr) conflict with upcoming c++0x types. | 95 # nullptr) conflict with upcoming c++0x types. |
| 96 'cflags_cc': ['-Wno-c++0x-compat'], | 96 'cflags_cc': ['-Wno-c++0x-compat'], |
| 97 }], | 97 }], |
| 98 ['OS=="linux" and target_arch=="arm"', { | 98 ['OS=="linux" and target_arch=="arm"', { |
| 99 # Due to a bug in gcc arm, we get warnings about uninitialized | 99 # Due to a bug in gcc arm, we get warnings about uninitialized |
| 100 # timesNewRoman.unstatic.3258 and colorTransparent.unstatic.4879. | 100 # timesNewRoman.unstatic.3258 and colorTransparent.unstatic.4879. |
| 101 'cflags': ['-Wno-uninitialized'], | 101 'cflags': ['-Wno-uninitialized'], |
| 102 }], | 102 }], |
| 103 # Only enable the blink_gc_plugin when using clang and chrome plugins. | 103 # Only enable the blink_gc_plugin when using clang and chrome plugins. |
| 104 ['blink_gc_plugin==1 and clang==1 and clang_use_chrome_plugins==1', { | 104 ['blink_gc_plugin==1 and clang==1 and clang_use_chrome_plugins==1', { |
| 105 'cflags': ['<!@(../../../tools/clang/scripts/blink_gc_plugin_flags.sh
enable-oilpan=<(enable_oilpan) <(blink_gc_plugin_flags))'], | 105 'cflags': ['<!@(python ../../../tools/clang/scripts/blink_gc_plugin_fl
ags.py enable-oilpan=<(enable_oilpan) <(blink_gc_plugin_flags))'], |
| 106 'xcode_settings': { | 106 'xcode_settings': { |
| 107 'OTHER_CFLAGS': ['<!@(../../../tools/clang/scripts/blink_gc_plugin_f
lags.sh enable-oilpan=<(enable_oilpan) <(blink_gc_plugin_flags))'], | 107 'OTHER_CFLAGS': ['<!@(python ../../../tools/clang/scripts/blink_gc_p
lugin_flags.py enable-oilpan=<(enable_oilpan) <(blink_gc_plugin_flags))'], |
| 108 }, |
| 109 'msvs_settings': { |
| 110 'VCCLCompilerTool': { |
| 111 'AdditionalOptions': ['<!@(python ../../../tools/clang/scripts/bli
nk_gc_plugin_flags.py enable-oilpan=<(enable_oilpan) <(blink_gc_plugin_flags))']
, |
| 112 }, |
| 108 }, | 113 }, |
| 109 }], | 114 }], |
| 110 ['blink_disable_partition_allocator==1', { | 115 ['blink_disable_partition_allocator==1', { |
| 111 'defines': [ | 116 'defines': [ |
| 112 'MEMORY_TOOL_REPLACES_ALLOCATOR', | 117 'MEMORY_TOOL_REPLACES_ALLOCATOR', |
| 113 ], | 118 ], |
| 114 }], | 119 }], |
| 115 ], | 120 ], |
| 116 }, | 121 }, |
| 117 }, | 122 }, |
| (...skipping 12 matching lines...) Expand all Loading... |
| 130 ], | 135 ], |
| 131 'direct_dependent_settings': { | 136 'direct_dependent_settings': { |
| 132 'variables': { | 137 'variables': { |
| 133 'chromium_code': 1, | 138 'chromium_code': 1, |
| 134 'clang_warning_flags_unset': [ '-Wglobal-constructors' ], | 139 'clang_warning_flags_unset': [ '-Wglobal-constructors' ], |
| 135 }, | 140 }, |
| 136 }, | 141 }, |
| 137 } | 142 } |
| 138 ], | 143 ], |
| 139 } | 144 } |
| OLD | NEW |