GYP: Remove targets inside include_tests==1 that are converted to GN.

webrtc/tools/tools.gyp

Index: webrtc/tools/tools.gyp
diff --git a/webrtc/tools/tools.gyp b/webrtc/tools/tools.gyp
index d1ff42bcbe689008d96faba6cdcda397cef2f7a9..b58b0c779afd94aba02a425d6cb8efd28cd402c8 100644
--- a/webrtc/tools/tools.gyp
+++ b/webrtc/tools/tools.gyp
@@ -142,139 +142,5 @@
         },
       ],
     }],
-    ['enable_protobuf==1 and include_tests==1', {
-      # TODO(terelius): This tool requires the include_test condition to
-      # prevent build errors when gflags isn't found in downstream projects.
-      # There should be a cleaner way to do this. The tool is not test related.
-      'targets': [
-        {
-          # Command line tool for RTC event log visualization
-          'target_name': 'event_log_visualizer',
-          'type': 'executable',
-          'dependencies': [
-            'event_log_visualizer_utils',
-            '<(webrtc_root)/test/test.gyp:field_trial',
-            '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
-          ],
-          'sources': [
-            'event_log_visualizer/main.cc',
-          ],
-        },
-      ],
-    }],
-    ['include_tests==1', {
-      'targets' : [
-        {
-          'target_name': 'activity_metric',
-          'type': 'executable',
-          'dependencies': [
-            '<(DEPTH)/testing/gtest.gyp:gtest',
-            '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
-            '<(webrtc_root)/modules/modules.gyp:audio_processing',
-          ],
-          'sources': [
-            'agc/activity_metric.cc',
-          ],
-        },  # activity_metric
-        {
-          'target_name': 'tools_unittests',
-          'type': '<(gtest_target_type)',
-          'dependencies': [
-            'frame_editing_lib',
-            'video_quality_analysis',
-            '<(webrtc_root)/tools/internal_tools.gyp:command_line_parser',
-            '<(webrtc_root)/test/test.gyp:test_support_main',
-            '<(DEPTH)/testing/gtest.gyp:gtest',
-          ],
-          'sources': [
-            'simple_command_line_parser_unittest.cc',
-            'frame_editing/frame_editing_unittest.cc',
-            'frame_analyzer/video_quality_analysis_unittest.cc',
-          ],
-          # Disable warnings to enable Win64 build, issue 1323.
-          'msvs_disabled_warnings': [
-            4267,  # size_t to int truncation.
-          ],
-          'conditions': [
-            ['OS=="android"', {
-              'dependencies': [
-                '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
-              ],
-            }],
-          ],
-        }, # tools_unittests
-        {
-          'target_name': 'rtp_analyzer',
-          'type': 'none',
-          'variables': {
-            'copy_output_dir%': '<(PRODUCT_DIR)',
-          },
-          'copies': [
-            {
-              'destination': '<(copy_output_dir)/',
-              'files': [
-                'py_event_log_analyzer/misc.py',
-                'py_event_log_analyzer/pb_parse.py',
-                'py_event_log_analyzer/rtp_analyzer.py',
-                'py_event_log_analyzer/rtp_analyzer.sh',
-              ]
-            },
-          ],
-          'dependencies': [ '<(webrtc_root)/webrtc.gyp:rtc_event_log_proto' ],
-          'process_outputs_as_sources': 1,
-        }, # rtp_analyzer
-      ], # targets
-      'conditions': [
-        ['OS=="android"', {
-          'targets': [
-            {
-              'target_name': 'tools_unittests_apk_target',
-              'type': 'none',
-              'dependencies': [
-                '<(android_tests_path):tools_unittests_apk',
-              ],
-            },
-          ],
-          'conditions': [
-            ['test_isolation_mode != "noop"',
-              {
-                'targets': [
-                  {
-                    'target_name': 'tools_unittests_apk_run',
-                    'type': 'none',
-                    'dependencies': [
-                      '<(android_tests_path):tools_unittests_apk',
-                    ],
-                    'includes': [
-                      '../build/isolate.gypi',
-                    ],
-                    'sources': [
-                      'tools_unittests_apk.isolate',
-                    ],
-                  },
-                ],
-              },
-            ],
-          ],
-        }],
-        ['test_isolation_mode != "noop"', {
-          'targets': [
-            {
-              'target_name': 'tools_unittests_run',
-              'type': 'none',
-              'dependencies': [
-                'tools_unittests',
-              ],
-              'includes': [
-                '../build/isolate.gypi',
-              ],
-              'sources': [
-                'tools_unittests.isolate',
-              ],
-            },
-          ],
-        }],
-      ],
-    }], # include_tests
   ], # conditions
 }