Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(206)

Side by Side Diff: webrtc/webrtc_tests.gypi

Issue 1259683003: Includes webrtc/build/protoc.gypi instead of build/protoc.gypi (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« webrtc/webrtc.gyp ('K') | « webrtc/webrtc.gyp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 'test/webrtc_test_common.gyp:webrtc_test_common', 170 'test/webrtc_test_common.gyp:webrtc_test_common',
171 'tools/tools.gyp:agc_manager', 171 'tools/tools.gyp:agc_manager',
172 'webrtc', 172 'webrtc',
173 ], 173 ],
174 'conditions': [ 174 'conditions': [
175 ['OS=="android"', { 175 ['OS=="android"', {
176 'dependencies': [ 176 'dependencies': [
177 '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', 177 '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
178 ], 178 ],
179 }], 179 }],
180 ['enable_protobuf==1', {
181 'defines': [
182 'ENABLE_RTC_EVENT_LOG',
183 ],
184 'dependencies': [
185 'webrtc.gyp:rtc_event_log',
186 'webrtc.gyp:rtc_event_log_proto',
187 ],
188 'sources': [
189 'video/rtc_event_log_unittest.cc',
190 ],
191 }],
180 ], 192 ],
181 }, 193 },
182 { 194 {
183 'target_name': 'webrtc_perf_tests', 195 'target_name': 'webrtc_perf_tests',
184 'type': '<(gtest_target_type)', 196 'type': '<(gtest_target_type)',
185 'sources': [ 197 'sources': [
186 'modules/audio_coding/neteq/test/neteq_performance_unittest.cc', 198 'modules/audio_coding/neteq/test/neteq_performance_unittest.cc',
187 'modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc', 199 'modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc',
188 200
189 'tools/agc/agc_manager_integrationtest.cc', 201 'tools/agc/agc_manager_integrationtest.cc',
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 'build/isolate.gypi', 291 'build/isolate.gypi',
280 ], 292 ],
281 'sources': [ 293 'sources': [
282 'webrtc_perf_tests.isolate', 294 'webrtc_perf_tests.isolate',
283 ], 295 ],
284 }, 296 },
285 ], 297 ],
286 }], 298 }],
287 ], 299 ],
288 } 300 }
OLDNEW
« webrtc/webrtc.gyp ('K') | « webrtc/webrtc.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698