Reland: [Cast] Consolidate plethora of GYP files into cast.gyp and cast_testing.gypi.

Reland of r265481 (https://codereview.chromium.org/245893005/) with the
following fixes:

1. Re-introduce 'include_tests%' conditional.
2. Conditionally include all Cast utility app targets based on a new GYP
   variable: include_cast_utility_apps
3. Fixed compile errors exposed by landing r265481 on the tree.

Testing:

1. This change was tested by building on Linux:
   `build/gyp_chromium && ninja -C out/Debug All`
2. Confirmed absence of 'include_cast_utility_apps=1' in
   chromium.gyp_env will disable the Cast utility targets.
3. Ran utility apps to confirm the fixes.

R=hclam@chromium.org

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

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

1 files changed, 0 insertions, 92 deletions

diff --git a/media/cast/logging/logging.gyp b/media/cast/logging/logging.gyp
deleted file mode 100644
index 29a96d8..0000000
--- a/media/cast/logging/logging.gyp
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-{
-  'variables': {
-    'chromium_code': 1,
-  },
-  'targets': [
-    {
-      'target_name': 'cast_common_logging',
-      'type': 'static_library',
-      'include_dirs': [
-        '<(DEPTH)/',
-      ],
-      'dependencies': [
-        'cast_logging_proto_lib',
-        '<(DEPTH)/base/base.gyp:base',
-      ],
-      'export_dependent_settings': [
-        'cast_logging_proto_lib',
-      ],
-      'sources': [
-        'logging_defines.cc',
-        'logging_defines.h',
-        'logging_impl.cc',
-        'logging_impl.h',
-        'logging_raw.cc',
-        'logging_raw.h',
-        'raw_event_subscriber.h',
-        'simple_event_subscriber.cc',
-        'simple_event_subscriber.h',
-        'stats_event_subscriber.cc',
-        'stats_event_subscriber.h',
-        'stats_util.cc',
-        'stats_util.h',
-      ], # source
-    },
-    {
-      'target_name': 'sender_logging',
-      'type': 'static_library',
-      'include_dirs': [
-        '<(DEPTH)/',
-      ],
-      'dependencies': [
-        'cast_common_logging',
-        'cast_logging_proto_lib',
-        '<(DEPTH)/base/base.gyp:base',
-      ],
-      'export_dependent_settings': [
-        'cast_logging_proto_lib',
-      ],
-      'sources': [
-        'encoding_event_subscriber.cc',
-        'encoding_event_subscriber.h',
-        'log_serializer.cc',
-        'log_serializer.h',
-      ], # source
-    },
-    {
-      'target_name': 'cast_logging_proto_lib',
-      'type': 'static_library',
-      'sources': [
-        'proto/proto_utils.cc',
-        'proto/raw_events.proto',
-      ],
-      'variables': {
-        'proto_in_dir': 'proto',
-        'proto_out_dir': 'media/cast/logging/proto',
-      },
-      'includes': ['../../../build/protoc.gypi'],
-    },
-    {
-      'target_name': 'cast_log_analysis',
-      'type': 'static_library',
-      'include_dirs': [
-        '<(DEPTH)/',
-      ],
-      'dependencies': [
-        'cast_logging_proto_lib',
-        'sender_logging',
-        '<(DEPTH)/base/base.gyp:base',
-      ],
-      'export_dependent_settings': [
-        'cast_logging_proto_lib',
-      ],
-      'sources': [
-        'log_deserializer.cc',
-        'log_deserializer.h',
-      ], # source
-    },
-  ],
-}