| 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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 'VCCLCompilerTool': { | 110 'VCCLCompilerTool': { |
| 111 'AdditionalOptions': ['<!@(python ../../../tools/clang/scripts/bli
nk_gc_plugin_flags.py enable-oilpan=<(enable_oilpan) <(blink_gc_plugin_flags))']
, | 111 'AdditionalOptions': ['<!@(python ../../../tools/clang/scripts/bli
nk_gc_plugin_flags.py enable-oilpan=<(enable_oilpan) <(blink_gc_plugin_flags))']
, |
| 112 }, | 112 }, |
| 113 }, | 113 }, |
| 114 }], | 114 }], |
| 115 ['blink_disable_partition_allocator==1', { | 115 ['blink_disable_partition_allocator==1', { |
| 116 'defines': [ | 116 'defines': [ |
| 117 'MEMORY_TOOL_REPLACES_ALLOCATOR', | 117 'MEMORY_TOOL_REPLACES_ALLOCATOR', |
| 118 ], | 118 ], |
| 119 }], | 119 }], |
| 120 ['use_system_icu==1', { |
| 121 'defines': [ |
| 122 'USING_SYSTEM_ICU', |
| 123 ], |
| 124 }], |
| 120 ], | 125 ], |
| 121 }, | 126 }, |
| 122 }, | 127 }, |
| 123 { | 128 { |
| 124 'target_name': 'unittest_config', | 129 'target_name': 'unittest_config', |
| 125 'type': 'none', | 130 'type': 'none', |
| 126 'dependencies': [ | 131 'dependencies': [ |
| 127 'config', | 132 'config', |
| 128 '<(DEPTH)/testing/gmock.gyp:gmock', | 133 '<(DEPTH)/testing/gmock.gyp:gmock', |
| 129 '<(DEPTH)/testing/gtest.gyp:gtest', | 134 '<(DEPTH)/testing/gtest.gyp:gtest', |
| 130 ], | 135 ], |
| 131 'export_dependent_settings': [ | 136 'export_dependent_settings': [ |
| 132 'config', | 137 'config', |
| 133 '<(DEPTH)/testing/gmock.gyp:gmock', | 138 '<(DEPTH)/testing/gmock.gyp:gmock', |
| 134 '<(DEPTH)/testing/gtest.gyp:gtest', | 139 '<(DEPTH)/testing/gtest.gyp:gtest', |
| 135 ], | 140 ], |
| 136 'direct_dependent_settings': { | 141 'direct_dependent_settings': { |
| 137 'variables': { | 142 'variables': { |
| 138 'chromium_code': 1, | 143 'chromium_code': 1, |
| 139 'clang_warning_flags_unset': [ '-Wglobal-constructors' ], | 144 'clang_warning_flags_unset': [ '-Wglobal-constructors' ], |
| 140 }, | 145 }, |
| 141 }, | 146 }, |
| 142 } | 147 } |
| 143 ], | 148 ], |
| 144 } | 149 } |
| OLD | NEW |