Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. |
| 2 # | 2 # |
| 3 # Use of this source code is governed by a BSD-style license | 3 # Use of this source code is governed by a BSD-style license |
| 4 # that can be found in the LICENSE file in the root of the source | 4 # that can be found in the LICENSE file in the root of the source |
| 5 # tree. An additional intellectual property rights grant can be found | 5 # tree. An additional intellectual property rights grant can be found |
| 6 # in the file PATENTS. All contributing project authors may | 6 # in the file PATENTS. All contributing project authors may |
| 7 # be found in the AUTHORS file in the root of the source tree. | 7 # be found in the AUTHORS file in the root of the source tree. |
| 8 { | 8 { |
| 9 'targets': [ | 9 'targets': [ |
| 10 { | 10 { |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 130 ], | 130 ], |
| 131 }], | 131 }], |
| 132 ['OS=="win"', { | 132 ['OS=="win"', { |
| 133 'sources': [ | 133 'sources': [ |
| 134 'base/win32_unittest.cc', | 134 'base/win32_unittest.cc', |
| 135 'base/win32regkey_unittest.cc', | 135 'base/win32regkey_unittest.cc', |
| 136 'base/win32window_unittest.cc', | 136 'base/win32window_unittest.cc', |
| 137 'base/win32windowpicker_unittest.cc', | 137 'base/win32windowpicker_unittest.cc', |
| 138 'base/winfirewall_unittest.cc', | 138 'base/winfirewall_unittest.cc', |
| 139 ], | 139 ], |
| 140 'sources!': [ | |
|
phoglund
2016/06/03 14:28:56
Why is this in this cl?
kjellander_webrtc
2016/06/06 17:04:22
I just cleaned up an entry that doesn't do anythin
| |
| 141 # TODO(pbos): Reenable this test. | |
| 142 'base/win32windowpicker_unittest.cc', | |
| 143 ], | |
| 144 }], | 140 }], |
| 145 ['OS=="win" and clang==1', { | 141 ['OS=="win" and clang==1', { |
| 146 'msvs_settings': { | 142 'msvs_settings': { |
| 147 'VCCLCompilerTool': { | 143 'VCCLCompilerTool': { |
| 148 'AdditionalOptions': [ | 144 'AdditionalOptions': [ |
| 149 # Disable warnings failing when compiling with Clang on Windows. | 145 # Disable warnings failing when compiling with Clang on Windows. |
| 150 # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366 | 146 # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366 |
| 151 '-Wno-missing-braces', | 147 '-Wno-missing-braces', |
| 152 '-Wno-sign-compare', | 148 '-Wno-sign-compare', |
| 153 '-Wno-unused-const-variable', | 149 '-Wno-unused-const-variable', |
| (...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 653 'build/isolate.gypi', | 649 'build/isolate.gypi', |
| 654 ], | 650 ], |
| 655 'sources': [ | 651 'sources': [ |
| 656 'webrtc_perf_tests.isolate', | 652 'webrtc_perf_tests.isolate', |
| 657 ], | 653 ], |
| 658 }, | 654 }, |
| 659 ], | 655 ], |
| 660 }], | 656 }], |
| 661 ], | 657 ], |
| 662 } | 658 } |
| OLD | NEW |