Create a target for important cast development tools

A new target 'cast_tools' is created to include:
cast_sender_app
cast_receiver_app
udp_proxy

cast_unittests now depends on cast_tools such that we have build
coverage with trybots.

Review URL: https://codereview.chromium.org/282103002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270810 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 112 insertions, 107 deletions

diff --git a/media/cast/cast_testing.gypi b/media/cast/cast_testing.gypi
index 2aa9fe1..56f2690 100644
--- a/media/cast/cast_testing.gypi
+++ b/media/cast/cast_testing.gypi
@@ -3,9 +3,6 @@
 # found in the LICENSE file.
 
 {
-  'variables': {
-    'include_cast_utility_apps%': 0,
-  },
   'targets': [
     {
       'target_name': 'cast_test_utility',
@@ -53,6 +50,9 @@
         'cast_rtcp',
         'cast_sender',
         'cast_test_utility',
+        # Not a true dependency. This is here to make sure the CQ can verify
+        # the tools compile correctly.
+        'cast_tools',
         'cast_transport',
         '<(DEPTH)/base/base.gyp:test_support_base',
         '<(DEPTH)/net/net.gyp:net',
@@ -118,113 +118,118 @@
         'video_sender/video_sender_unittest.cc',
       ], # source
     },
-  ], # targets
-  'conditions': [
-    ['include_cast_utility_apps==1', {
-      'targets': [
-        {
-          'target_name': 'cast_receiver_app',
-          'type': 'executable',
-          'include_dirs': [
-            '<(DEPTH)/',
-          ],
+    {
+      # This is a target for the collection of cast development tools.
+      # They are built on bots but not shipped.
+      'target_name': 'cast_tools',
+      'type': 'none',
+      'dependencies': [
+        'cast_receiver_app',
+        'cast_sender_app',
+        'udp_proxy',
+      ],
+    },
+    {
+      'target_name': 'cast_receiver_app',
+      'type': 'executable',
+      'include_dirs': [
+        '<(DEPTH)/',
+      ],
+      'dependencies': [
+        'cast_base',
+        'cast_receiver',
+        'cast_test_utility',
+        'cast_transport',
+        '<(DEPTH)/net/net.gyp:net_test_support',
+        '<(DEPTH)/media/media.gyp:media',
+        '<(DEPTH)/testing/gtest.gyp:gtest',
+        '<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',
+      ],
+      'sources': [
+        '<(DEPTH)/media/cast/test/receiver.cc',
+      ],
+      'conditions': [
+        ['OS == "linux" and use_x11==1', {
           'dependencies': [
-            'cast_base',
-            'cast_receiver',
-            'cast_test_utility',
-            'cast_transport',
-            '<(DEPTH)/net/net.gyp:net_test_support',
-            '<(DEPTH)/media/media.gyp:media',
-            '<(DEPTH)/testing/gtest.gyp:gtest',
-            '<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',
+            '<(DEPTH)/build/linux/system.gyp:x11',
+            '<(DEPTH)/build/linux/system.gyp:xext',
           ],
           'sources': [
-            '<(DEPTH)/media/cast/test/receiver.cc',
-          ],
-          'conditions': [
-            ['OS == "linux" and use_x11==1', {
-              'dependencies': [
-                '<(DEPTH)/build/linux/system.gyp:x11',
-                '<(DEPTH)/build/linux/system.gyp:xext',
-              ],
-              'sources': [
-                '<(DEPTH)/media/cast/test/linux_output_window.cc',
-                '<(DEPTH)/media/cast/test/linux_output_window.h',
-                '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
-              ],
-            }],
-          ],
-        },
-        {
-          'target_name': 'cast_sender_app',
-          'type': 'executable',
-          'include_dirs': [
-            '<(DEPTH)/',
-          ],
-          'dependencies': [
-            'cast_base',
-            'cast_sender',
-            'cast_test_utility',
-            'cast_transport',
-            '<(DEPTH)/net/net.gyp:net_test_support',
-            '<(DEPTH)/media/media.gyp:media',
-            '<(DEPTH)/testing/gtest.gyp:gtest',
-            '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
-            '<(DEPTH)/third_party/opus/opus.gyp:opus',
+            '<(DEPTH)/media/cast/test/linux_output_window.cc',
+            '<(DEPTH)/media/cast/test/linux_output_window.h',
             '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
           ],
-          'sources': [
-            '<(DEPTH)/media/cast/test/sender.cc',
-          ],
-        },
-        {
-          'target_name': 'generate_barcode_video',
-          'type': 'executable',
-          'include_dirs': [
-            '<(DEPTH)/',
-          ],
-          'dependencies': [
-            'cast_test_utility',
-            '<(DEPTH)/base/base.gyp:base',
-            '<(DEPTH)/media/media.gyp:media',
-          ],
-          'sources': [
-            'test/utility/generate_barcode_video.cc',
-          ],
-        },
-        {
-          'target_name': 'generate_timecode_audio',
-          'type': 'executable',
-          'include_dirs': [
-            '<(DEPTH)/',
-          ],
-          'dependencies': [
-            'cast_base',
-            'cast_test_utility',
-            'cast_transport',
-            '<(DEPTH)/base/base.gyp:base',
-            '<(DEPTH)/media/media.gyp:media',
-          ],
-          'sources': [
-            'test/utility/generate_timecode_audio.cc',
-          ],
-        },
-        {
-          'target_name': 'udp_proxy',
-          'type': 'executable',
-          'include_dirs': [
-            '<(DEPTH)/',
-          ],
-          'dependencies': [
-            'cast_test_utility',
-            '<(DEPTH)/base/base.gyp:base',
-            '<(DEPTH)/media/media.gyp:media',
-          ],
-          'sources': [
-            'test/utility/udp_proxy_main.cc',
-          ],
-        },
-      ], # targets
-    }],
-  ], # conditions
+        }],
+      ],
+    },
+    {
+      'target_name': 'cast_sender_app',
+      'type': 'executable',
+      'include_dirs': [
+        '<(DEPTH)/',
+      ],
+      'dependencies': [
+        'cast_base',
+        'cast_sender',
+        'cast_test_utility',
+        'cast_transport',
+        '<(DEPTH)/net/net.gyp:net_test_support',
+        '<(DEPTH)/media/media.gyp:media',
+        '<(DEPTH)/testing/gtest.gyp:gtest',
+        '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+        '<(DEPTH)/third_party/opus/opus.gyp:opus',
+        '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
+      ],
+      'sources': [
+        '<(DEPTH)/media/cast/test/sender.cc',
+      ],
+    },
+    {
+      'target_name': 'generate_barcode_video',
+      'type': 'executable',
+      'include_dirs': [
+        '<(DEPTH)/',
+      ],
+      'dependencies': [
+        'cast_test_utility',
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/media/media.gyp:media',
+      ],
+      'sources': [
+        'test/utility/generate_barcode_video.cc',
+      ],
+    },
+    {
+      'target_name': 'generate_timecode_audio',
+      'type': 'executable',
+      'include_dirs': [
+        '<(DEPTH)/',
+      ],
+      'dependencies': [
+        'cast_base',
+        'cast_test_utility',
+        'cast_transport',
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/media/media.gyp:media',
+      ],
+      'sources': [
+        'test/utility/generate_timecode_audio.cc',
+      ],
+    },
+    {
+      'target_name': 'udp_proxy',
+      'type': 'executable',
+      'include_dirs': [
+        '<(DEPTH)/',
+      ],
+      'dependencies': [
+        'cast_test_utility',
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/media/media.gyp:media',
+      ],
+      'sources': [
+        'test/utility/udp_proxy_main.cc',
+      ],
+    }
+  ], # targets
 }