NetEq tests: BUILD target reorg

webrtc/modules/audio_coding/BUILD.gn

 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 import("../../webrtc.gni")
 import("audio_coding.gni")
@@ skipping 1087 matching lines @@
     }
     defines += [ "WEBRTC_CODEC_G722" ]
     deps += [ ":g722" ]
   }
 }
 
 # Although providing only test support, this target must be outside of the
 # rtc_include_tests conditional. The reason is that it supports fuzzer tests
 # that ultimately are built and run as a part of the Chromium ecosystem, which
 # does not set the rtc_include_tests flag.
-rtc_source_set("neteq_test_minimal") {
-  testonly = true
-
-  # TODO(kjellander): Remove (bugs.webrtc.org/6828)
-  # Has cyclic dependency with :neteq_unittest_tools
-  check_includes = false
-
+rtc_source_set("neteq_tools_minimal") {
   sources = [
+    "neteq/tools/audio_sink.cc",
+    "neteq/tools/audio_sink.h",
     "neteq/tools/encode_neteq_input.cc",
     "neteq/tools/encode_neteq_input.h",
+    "neteq/tools/neteq_input.h",
     "neteq/tools/neteq_test.cc",
     "neteq/tools/neteq_test.h",
+    "neteq/tools/packet.cc",
+    "neteq/tools/packet.h",
+    "neteq/tools/packet_source.cc",
+    "neteq/tools/packet_source.h",
   ]
 
   if (!build_with_chromium && is_clang) {
     # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
     suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
   }
 
   deps = [
     ":audio_encoder_interface",
     ":neteq",
+    "..:module_api",
     "../..:webrtc_common",
     "../../api/audio_codecs:builtin_audio_decoder_factory",
     "../../base:rtc_base_approved",
+    "../rtp_rtcp",
   ]
 }
 
 if (rtc_include_tests) {
   group("audio_coding_tests") {
     testonly = true
     public_deps = [
       ":RTPchange",
       ":RTPencode",
       ":RTPjitter",
@@ skipping 86 matching lines @@
     # cover (which would be confusing to read and hard to maintain).
     if (!is_android && !is_ios) {
       visibility = [ "//webrtc:webrtc_perf_tests" ]
     }
     sources = [
       "codecs/opus/opus_complexity_unittest.cc",
       "neteq/test/neteq_performance_unittest.cc",
     ]
     deps = [
       ":neteq_test_support",
-      ":neteq_unittest_tools",
+      ":neteq_test_tools",
       ":webrtc_opus",
       "../..:webrtc_common",
       "../../base:protobuf_utils",
       "../../base:rtc_base_approved",
       "../../system_wrappers:system_wrappers",
       "../../test:test_support",
     ]
 
     if (!build_with_chromium && is_clang) {
       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
     }
   }
 
   rtc_source_set("acm_receive_test") {
     testonly = true
     sources = [
       "acm2/acm_receive_test.cc",
       "acm2/acm_receive_test.h",
     ]
 
     defines = audio_coding_defines
 
     deps = audio_coding_deps + [
              ":audio_coding",
              ":audio_format_conversion",
              "../../api/audio_codecs:audio_codecs_api",
              "../../api/audio_codecs:builtin_audio_decoder_factory",
-             ":neteq_unittest_tools",
+             ":neteq_tools",
              "../../base:rtc_base_approved",
              "../../test:test_support",
              "//testing/gtest",
            ]
   }
 
   rtc_source_set("acm_send_test") {
     testonly = true
     sources = [
       "acm2/acm_send_test.cc",
       "acm2/acm_send_test.h",
     ]
 
     defines = audio_coding_defines
 
     deps = audio_coding_deps + [
              ":audio_coding",
              "../../api/audio_codecs:audio_codecs_api",
              ":audio_encoder_interface",
-             ":neteq_unittest_tools",
+             ":neteq_tools",
              "../../base:rtc_base_approved",
              "../../test:test_support",
              "//testing/gtest",
            ]
   }
 
   rtc_executable("delay_test") {
     testonly = true
     sources = [
       "test/Channel.cc",
@@ skipping 73 matching lines @@
     deps = []
 
     defines = neteq_defines
 
     deps += audio_coding_deps
     deps += [
       ":ilbc",
       ":isac",
       ":isac_fix",
       ":neteq",
-      ":neteq_unittest_tools",
+      ":neteq_tools",
       "../../api/audio_codecs:audio_codecs_api",
       "../../base:protobuf_utils",
       "../../common_audio",
       "../../test:test_main",
       "//testing/gtest",
     ]
 
     data = audio_decoder_unittests_resources
 
     if (is_android) {
@@ skipping 56 matching lines @@
 
       if (is_win) {
         cflags = [
           # TODO(kjellander): bugs.webrtc.org/261: Fix this warning.
           "/wd4373",  # virtual function override.
         ]
       }
 
       deps += [
         ":neteq",
-        ":neteq_unittest_tools",
+        ":neteq_test_tools",
         "../..:webrtc_common",
         "../../base:rtc_base_approved",
         "../../system_wrappers:system_wrappers_default",
         "../../test:test_support",
         "//third_party/gflags",
       ]
     }
   }
 
   rtc_test("audio_codec_speed_tests") {
@@ skipping 38 matching lines @@
       "neteq/tools/neteq_performance_test.h",
     ]
 
     if (!build_with_chromium && is_clang) {
       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
     }
 
     deps = [
       ":neteq",
-      ":neteq_unittest_tools",
+      ":neteq_test_tools",
       ":pcm16b",
       "..:module_api",
       "../..:webrtc_common",
       "../../api/audio_codecs:audio_codecs_api",
       "../../api/audio_codecs:builtin_audio_decoder_factory",
       "../../base:rtc_base_approved",
       "../../system_wrappers",
       "../../test:test_support",
       "//testing/gtest",
     ]
   }
 
   rtc_source_set("neteq_quality_test_support") {
     testonly = true
     sources = [
       "neteq/tools/neteq_quality_test.cc",
       "neteq/tools/neteq_quality_test.h",
     ]
 
     if (!build_with_chromium && is_clang) {
       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
     }
 
     deps = [
       ":neteq",
-      ":neteq_unittest_tools",
+      ":neteq_test_tools",
       "..:module_api",
       "../..:webrtc_common",
       "../../api/audio_codecs:builtin_audio_decoder_factory",
       "../../base:rtc_base_approved",
       "../../test:test_support",
       "//testing/gtest",
       "//third_party/gflags",
     ]
   }
 
-  config("neteq_unittest_tools_config") {
+  config("neteq_tools_config") {
     include_dirs = [ "tools" ]
   }
 
-  rtc_source_set("neteq_unittest_tools") {
+  rtc_source_set("neteq_tools") {
+    sources = [
+      "neteq/tools/fake_decode_from_file.cc",

[kjellander (google.com), 2017/04/28 06:56:18]

I can't explain why, but it seems you need to either fix the warnings or add:

if (is_win) {
 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
}

to this target now, due to fake_decode_from_file.cc.

+      "neteq/tools/fake_decode_from_file.h",
+      "neteq/tools/input_audio_file.cc",
+      "neteq/tools/input_audio_file.h",
+      "neteq/tools/neteq_replacement_input.cc",
+      "neteq/tools/neteq_replacement_input.h",
+      "neteq/tools/resample_input_audio_file.cc",
+      "neteq/tools/resample_input_audio_file.h",
+    ]
+
+    public_configs = [ ":neteq_tools_config" ]
+
+    if (!build_with_chromium && is_clang) {
+      # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
+      suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
+    }
+
+    deps = [
+      "../..:webrtc_common",
+      "../../api/audio_codecs:audio_codecs_api",
+      "../../base:rtc_base_approved",
+      "../../common_audio",
+      "../rtp_rtcp",
+    ]
+
+    public_deps = [
+      ":neteq_tools_minimal",
+    ]
+  }
+
+  rtc_source_set("neteq_test_tools") {
     testonly = true
     sources = [
       "neteq/tools/audio_checksum.h",
       "neteq/tools/audio_loop.cc",
       "neteq/tools/audio_loop.h",
-      "neteq/tools/audio_sink.cc",
-      "neteq/tools/audio_sink.h",
       "neteq/tools/constant_pcm_packet_source.cc",
       "neteq/tools/constant_pcm_packet_source.h",
-      "neteq/tools/fake_decode_from_file.cc",
-      "neteq/tools/fake_decode_from_file.h",
-      "neteq/tools/input_audio_file.cc",
-      "neteq/tools/input_audio_file.h",
-      "neteq/tools/neteq_input.h",
-      "neteq/tools/neteq_replacement_input.cc",
-      "neteq/tools/neteq_replacement_input.h",
       "neteq/tools/output_audio_file.h",
       "neteq/tools/output_wav_file.h",
-      "neteq/tools/packet.cc",
-      "neteq/tools/packet.h",
-      "neteq/tools/packet_source.cc",
-      "neteq/tools/packet_source.h",
-      "neteq/tools/resample_input_audio_file.cc",
-      "neteq/tools/resample_input_audio_file.h",
       "neteq/tools/rtp_file_source.cc",
       "neteq/tools/rtp_file_source.h",
       "neteq/tools/rtp_generator.cc",
       "neteq/tools/rtp_generator.h",
     ]
 
-    public_configs = [ ":neteq_unittest_tools_config" ]
+    public_configs = [ ":neteq_tools_config" ]
 
     if (!build_with_chromium && is_clang) {
       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
     }
 
     deps = [
-      ":audio_encoder_interface",
       ":pcm16b",
       "..:module_api",
       "../..:webrtc_common",
-      "../../api/audio_codecs:audio_codecs_api",
       "../../base:rtc_base_approved",
       "../../common_audio",
       "../../test:rtp_test_utils",
       "../rtp_rtcp",
     ]
 
     public_deps = [
-      ":neteq_test_minimal",
+      ":neteq_tools",
+      ":neteq_tools_minimal",
     ]
 
     if (rtc_enable_protobuf) {
       sources += [
         "neteq/tools/neteq_packet_source_input.cc",
         "neteq/tools/neteq_packet_source_input.h",
       ]
       deps += [ ":rtc_event_log_source" ]
     }
   }
 
-  rtc_source_set("neteq_test_tools") {
+  rtc_source_set("neteq_test_tools_deprecated") {
     testonly = true
     sources = [
       "neteq/test/NETEQTEST_DummyRTPpacket.cc",
       "neteq/test/NETEQTEST_DummyRTPpacket.h",
       "neteq/test/NETEQTEST_RTPpacket.cc",
       "neteq/test/NETEQTEST_RTPpacket.h",
     ]
 
     deps = [
       ":cng",
@@ skipping 45 matching lines @@
     testonly = true
 
     deps = [
       # TODO(hlundin): Make RTPencode use ACM to encode files.
       ":cng",
       ":g711",
       ":g722",
       ":ilbc",
       ":isac",
       ":neteq",
-      ":neteq_test_tools",
+      ":neteq_test_tools_deprecated",
       ":pcm16b",
       ":webrtc_opus",
       "../..:webrtc_common",
       "../../base:rtc_base_approved",
       "../../common_audio",
     ]
 
     configs += [ ":RTPencode_config" ]
 
     sources = [
@@ skipping 14 matching lines @@
   }
 
   rtc_executable("RTPchange") {
     testonly = true
 
     sources = [
       "neteq/test/RTPchange.cc",
     ]
 
     deps = [
-      ":neteq_test_tools",
+      ":neteq_test_tools_deprecated",
     ]
   }
 
   rtc_executable("rtpcat") {
     testonly = true
 
     sources = [
       "neteq/tools/rtpcat.cc",
     ]
 
     deps = [
       "../../base:rtc_base_approved",
       "../../system_wrappers:system_wrappers_default",
       "../../test:rtp_test_utils",
       "//testing/gtest",
     ]
   }
 
   rtc_executable("RTPtimeshift") {
     testonly = true
 
     sources = [
       "neteq/test/RTPtimeshift.cc",
     ]
 
     deps = [
-      ":neteq_test_tools",
+      ":neteq_test_tools_deprecated",
       "../../test:test_support",
       "//testing/gtest",
     ]
   }
 
   rtc_executable("RTPjitter") {
     testonly = true
     deps = [
       "../..:webrtc_common",
       "../../base:rtc_base_approved",
       "../../test:test_support",
       "//testing/gtest",
     ]
     sources = [
       "neteq/test/RTPjitter.cc",
     ]
   }
 
   rtc_executable("rtp_analyze") {
     testonly = true
 
     sources = [
       "neteq/tools/rtp_analyze.cc",
     ]
 
     deps = [
       ":neteq",
-      ":neteq_unittest_tools",
+      ":neteq_test_tools",
       ":pcm16b",
       "../../system_wrappers:system_wrappers_default",
       "//testing/gtest",
       "//third_party/gflags:gflags",
     ]
 
     if (!build_with_chromium && is_clang) {
       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
     }
   }
 
   rtc_executable("neteq_opus_quality_test") {
     testonly = true
 
     sources = [
       "neteq/test/neteq_opus_quality_test.cc",
     ]
 
     deps = [
       ":neteq",
       ":neteq_quality_test_support",
-      ":neteq_unittest_tools",
+      ":neteq_tools",
       ":webrtc_opus",
       "../../test:test_main",
       "//testing/gtest",
       "//third_party/gflags",
     ]
   }
 
   rtc_executable("neteq_speed_test") {
     testonly = true
 
@@ skipping 15 matching lines @@
     testonly = true
 
     sources = [
       "neteq/test/neteq_ilbc_quality_test.cc",
     ]
 
     deps = [
       ":ilbc",
       ":neteq",
       ":neteq_quality_test_support",
-      ":neteq_unittest_tools",
+      ":neteq_tools",
       "../..:webrtc_common",
       "../../base:rtc_base_approved",
       "../../system_wrappers:system_wrappers_default",
       "../../test:test_main",
       "//testing/gtest",
       "//third_party/gflags",
     ]
   }
 
   rtc_executable("neteq_isac_quality_test") {
@@ skipping 287 matching lines @@
       ":builtin_audio_encoder_factory",
       ":cng",
       ":g711",
       ":ilbc",
       ":isac",
       ":isac_c",
       ":isac_fix",
       ":legacy_encoded_audio_frame",
       ":neteq",
       ":neteq_test_support",
-      ":neteq_unittest_tools",
+      ":neteq_test_tools",
       ":pcm16b",
       ":red",
       ":rent_a_codec",
       ":webrtc_opus",
       "..:module_api",
       "../..:webrtc_common",
       "../../api/audio_codecs:audio_codecs_api",
       "../../api/audio_codecs:builtin_audio_decoder_factory",
       "../../base:protobuf_utils",
       "../../base:rtc_base",
@@ skipping 47 matching lines @@
 # webrtc/api/audio_codecs:builtin_audio_decoder_factory instead.
 # TODO(kwiberg): Remove this.
 rtc_source_set("builtin_audio_decoder_factory") {
   sources = [
     "codecs/builtin_audio_decoder_factory.h",
   ]
   deps = [
     "../../api/audio_codecs:builtin_audio_decoder_factory",
   ]
 }