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

Side by Side Diff: webrtc/media/media.gyp

Issue 2152013002: Reland of Switch to use SequencedTaskChecker instead of ThreadChecker where needed. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@fix_sq_tq_include
Patch Set: Fixed dependency errors. Created 4 years, 5 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
« no previous file with comments | « webrtc/common_video/include/i420_buffer_pool.h ('k') | webrtc/modules/video_coding/BUILD.gn » ('j') | 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) 2016 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2016 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 { 9 {
10 'includes': [ '../build/common.gypi', ], 10 'includes': [ '../build/common.gypi', ],
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 'conditions': [ 192 'conditions': [
193 ['include_tests==1', { 193 ['include_tests==1', {
194 'targets' : [ 194 'targets' : [
195 { 195 {
196 'target_name': 'rtc_unittest_main', 196 'target_name': 'rtc_unittest_main',
197 'type': 'static_library', 197 'type': 'static_library',
198 'dependencies': [ 198 'dependencies': [
199 '<(DEPTH)/testing/gmock.gyp:gmock', 199 '<(DEPTH)/testing/gmock.gyp:gmock',
200 '<(DEPTH)/testing/gtest.gyp:gtest', 200 '<(DEPTH)/testing/gtest.gyp:gtest',
201 '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils', 201 '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
202 '<(webrtc_root)/media/media.gyp:rtc_media',
202 ], 203 ],
203 'direct_dependent_settings': { 204 'direct_dependent_settings': {
204 'include_dirs': [ 205 'include_dirs': [
205 '<(libyuv_dir)/include', 206 '<(libyuv_dir)/include',
206 '<(DEPTH)/testing/gmock/include', 207 '<(DEPTH)/testing/gmock/include',
207 ], 208 ],
208 }, 209 },
209 'conditions': [ 210 'conditions': [
210 ['build_libyuv==1', { 211 ['build_libyuv==1', {
211 'dependencies': ['<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',] , 212 'dependencies': ['<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',] ,
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 'engine/fakewebrtcvideocapturemodule.h', 244 'engine/fakewebrtcvideocapturemodule.h',
244 'engine/fakewebrtcvideoengine.h', 245 'engine/fakewebrtcvideoengine.h',
245 'engine/fakewebrtcvoiceengine.h', 246 'engine/fakewebrtcvoiceengine.h',
246 ], 247 ],
247 }, # target rtc_unittest_main 248 }, # target rtc_unittest_main
248 { 249 {
249 'target_name': 'rtc_media_unittests', 250 'target_name': 'rtc_media_unittests',
250 'type': 'executable', 251 'type': 'executable',
251 'dependencies': [ 252 'dependencies': [
252 '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils', 253 '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
253 '<(webrtc_root)/media/media.gyp:rtc_media',
254 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default' , 254 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default' ,
255 '<(webrtc_root)/test/test.gyp:test_support', 255 '<(webrtc_root)/test/test.gyp:test_support',
256 'rtc_unittest_main', 256 'rtc_unittest_main',
257 ], 257 ],
258 'sources': [ 258 'sources': [
259 'base/codec_unittest.cc', 259 'base/codec_unittest.cc',
260 'base/rtpdataengine_unittest.cc', 260 'base/rtpdataengine_unittest.cc',
261 'base/rtpdump_unittest.cc', 261 'base/rtpdump_unittest.cc',
262 'base/rtputils_unittest.cc', 262 'base/rtputils_unittest.cc',
263 'base/streamparams_unittest.cc', 263 'base/streamparams_unittest.cc',
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 'sources': [ 354 'sources': [
355 'rtc_media_unittests.isolate', 355 'rtc_media_unittests.isolate',
356 ], 356 ],
357 }, 357 },
358 ], 358 ],
359 }], 359 }],
360 ], # conditions 360 ], # conditions
361 }], # include_tests==1 361 }], # include_tests==1
362 ], # conditions 362 ], # conditions
363 } 363 }
OLDNEW
« no previous file with comments | « webrtc/common_video/include/i420_buffer_pool.h ('k') | webrtc/modules/video_coding/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698