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

Unified Diff: media/cast/cast_testing.gypi

Issue 2133903002: RELAND: Merge VideoSenderConfig and AudioSenderConfig. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Disabled two unittests. 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/cast/cast_sender_impl.cc ('k') | media/cast/receiver/frame_receiver.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/cast_testing.gypi
diff --git a/media/cast/cast_testing.gypi b/media/cast/cast_testing.gypi
index 8700d32d8c4e498dda5a36a6ede94e0e559f4474..08b2a03c4430f1914fbe681d479d23f5e0666fe5 100644
--- a/media/cast/cast_testing.gypi
+++ b/media/cast/cast_testing.gypi
@@ -142,35 +142,19 @@
'<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
],
}],
- ], # conditions
- },
- ], # targets
- 'conditions': [
- ['OS=="ios" or OS=="mac"', {
- 'targets': [
- {
- # GN version: //media/cast:cast_h264_vt_encoder_unittests
- # TODO(miu): This can be rolled into cast_unittests now that FFMPEG
- # dependency issues are resolved for iOS; but there are bot/isolates
- # to update too.
- 'target_name': 'cast_h264_vt_encoder_unittests',
- 'type': '<(gtest_target_type)',
- 'include_dirs': [
- '<(DEPTH)/',
+ ['OS=="ios" or OS=="mac"', {
+ 'sources': [
+ 'sender/h264_vt_encoder_unittest.cc',
],
+
'dependencies': [
- 'cast_common',
- 'cast_sender',
- 'cast_test_utility',
- '<(DEPTH)/testing/gmock.gyp:gmock',
- '<(DEPTH)/testing/gtest.gyp:gtest',
'<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
],
- 'sources': [
- 'sender/h264_vt_encoder_unittest.cc',
- ],
- }], # targets
- }], # OS=="ios" or OS=="mac"
+ }] # OS=="ios" or OS=="mac"
+ ], # conditions
+ },
+ ], # targets
+ 'conditions': [
['OS=="android"', {
'targets': [
{
« no previous file with comments | « media/cast/cast_sender_impl.cc ('k') | media/cast/receiver/frame_receiver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698