| OLD | NEW |
| 1 # Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2011 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 # TODO(andrew): consider moving test_support to src/base/test. | 9 # TODO(andrew): consider moving test_support to src/base/test. |
| 10 { | 10 { |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 'testsupport/perf_test.h', | 133 'testsupport/perf_test.h', |
| 134 'testsupport/trace_to_stderr.cc', | 134 'testsupport/trace_to_stderr.cc', |
| 135 'testsupport/trace_to_stderr.h', | 135 'testsupport/trace_to_stderr.h', |
| 136 ], | 136 ], |
| 137 'conditions': [ | 137 'conditions': [ |
| 138 ['OS=="ios"', { | 138 ['OS=="ios"', { |
| 139 'xcode_settings': { | 139 'xcode_settings': { |
| 140 'CLANG_ENABLE_OBJC_ARC': 'YES', | 140 'CLANG_ENABLE_OBJC_ARC': 'YES', |
| 141 }, | 141 }, |
| 142 }], | 142 }], |
| 143 ['use_x11==1', { |
| 144 'dependencies': [ |
| 145 '<(DEPTH)/tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 146 ], |
| 147 }], |
| 143 ], | 148 ], |
| 144 }, | 149 }, |
| 145 { | 150 { |
| 146 # Depend on this target when you want to have test_support but also the | 151 # Depend on this target when you want to have test_support but also the |
| 147 # main method needed for gtest to execute! | 152 # main method needed for gtest to execute! |
| 148 'target_name': 'test_support_main', | 153 'target_name': 'test_support_main', |
| 149 'type': 'static_library', | 154 'type': 'static_library', |
| 150 'dependencies': [ | 155 'dependencies': [ |
| 151 'field_trial', | 156 'field_trial', |
| 152 'histogram', | 157 'histogram', |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 236 '../build/isolate.gypi', | 241 '../build/isolate.gypi', |
| 237 ], | 242 ], |
| 238 'sources': [ | 243 'sources': [ |
| 239 'test_support_unittests.isolate', | 244 'test_support_unittests.isolate', |
| 240 ], | 245 ], |
| 241 }, | 246 }, |
| 242 ], | 247 ], |
| 243 }], | 248 }], |
| 244 ], | 249 ], |
| 245 } | 250 } |
| OLD | NEW |