NetEq tests: BUILD target reorg

webrtc/modules/audio_coding/BUILD.gn

Index: webrtc/modules/audio_coding/BUILD.gn
diff --git a/webrtc/modules/audio_coding/BUILD.gn b/webrtc/modules/audio_coding/BUILD.gn
index 8195e47aa64cb7b823f6ec7ac38289b4a1aaf4a4..6217670044aec81dfa852921c24c1309406b1d48 100644
--- a/webrtc/modules/audio_coding/BUILD.gn
+++ b/webrtc/modules/audio_coding/BUILD.gn
@@ -1106,17 +1106,18 @@ rtc_static_library("neteq") {
 # 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
-
   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) {
@@ -1127,9 +1128,11 @@ rtc_source_set("neteq_test_minimal") {
   deps = [
     ":audio_encoder_interface",
     ":neteq",
+    "..:module_api",
     "../..:webrtc_common",
     "../../api/audio_codecs:builtin_audio_decoder_factory",
     "../../base:rtc_base_approved",
+    "../rtp_rtcp",
   ]
 }
 
@@ -1236,7 +1239,7 @@ if (rtc_include_tests) {
     ]
     deps = [
       ":neteq_test_support",
-      ":neteq_unittest_tools",
+      ":neteq_unittest_tools_extended",
       ":webrtc_opus",
       "../..:webrtc_common",
       "../../base:protobuf_utils",
@@ -1456,7 +1459,7 @@ if (rtc_include_tests) {
 
       deps += [
         ":neteq",
-        ":neteq_unittest_tools",
+        ":neteq_unittest_tools_extended",
         "../..:webrtc_common",
         "../../base:rtc_base_approved",
         "../../system_wrappers:system_wrappers_default",
@@ -1515,7 +1518,7 @@ if (rtc_include_tests) {
 
     deps = [
       ":neteq",
-      ":neteq_unittest_tools",
+      ":neteq_unittest_tools_extended",
       ":pcm16b",
       "..:module_api",
       "../..:webrtc_common",
@@ -1542,7 +1545,7 @@ if (rtc_include_tests) {
 
     deps = [
       ":neteq",
-      ":neteq_unittest_tools",
+      ":neteq_unittest_tools_extended",
       "..:module_api",
       "../..:webrtc_common",
       "../../api/audio_codecs:builtin_audio_decoder_factory",
@@ -1558,30 +1561,47 @@ if (rtc_include_tests) {
   }
 
   rtc_source_set("neteq_unittest_tools") {

[kjellander_webrtc, 2017/04/27 10:34:52]

I'd like to avoid having a target with "unittest" in the name doesn't have
testonly=true set, especially as Mirko and I have been looking at these
particular targets yesterday in our attempts to enable GN check for webrtc/test
without breaking Chromium (the fuzzers are making it hard).

How about naming this one something like neteq_input_tools or something like
that?

[hlundin-webrtc, 2017/04/27 11:49:42]

It is not the only target that contains "input" things. I Changed it to
neteq_tools instead.

-    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",
+    ]
+
+    public_configs = [ ":neteq_unittest_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_test_minimal",
+    ]
+  }
+
+  rtc_source_set("neteq_unittest_tools_extended") {

[kjellander_webrtc, 2017/04/27 10:34:52]

This name doesn't say much about what's left in here. Can you come up with a
better name?
Or just use neteq_test_tools (I prefer the word 'test' over 'unittests'). 

[hlundin-webrtc, 2017/04/27 11:49:42]

I went for neteq_test_tools. Only problem is that it was already taken by
another target, but that is mainly old cruft, so I renamed that one to
*_deprecated.

+    testonly = true
+    sources = [
+      "neteq/tools/audio_checksum.h",
+      "neteq/tools/audio_loop.cc",
+      "neteq/tools/audio_loop.h",
+      "neteq/tools/constant_pcm_packet_source.cc",
+      "neteq/tools/constant_pcm_packet_source.h",
+      "neteq/tools/output_audio_file.h",
+      "neteq/tools/output_wav_file.h",
       "neteq/tools/rtp_file_source.cc",
       "neteq/tools/rtp_file_source.h",
       "neteq/tools/rtp_generator.cc",
@@ -1596,11 +1616,9 @@ if (rtc_include_tests) {
     }
 
     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",
@@ -1609,6 +1627,7 @@ if (rtc_include_tests) {
 
     public_deps = [
       ":neteq_test_minimal",
+      ":neteq_unittest_tools",
     ]
 
     if (rtc_enable_protobuf) {
@@ -1776,7 +1795,7 @@ if (rtc_include_tests) {
 
     deps = [
       ":neteq",
-      ":neteq_unittest_tools",
+      ":neteq_unittest_tools_extended",
       ":pcm16b",
       "../../system_wrappers:system_wrappers_default",
       "//testing/gtest",
@@ -2143,7 +2162,7 @@ if (rtc_include_tests) {
       ":legacy_encoded_audio_frame",
       ":neteq",
       ":neteq_test_support",
-      ":neteq_unittest_tools",
+      ":neteq_unittest_tools_extended",
       ":pcm16b",
       ":red",
       ":rent_a_codec",