From 861da3c662896ffb77754e396474ecc35b7f21d1 Mon Sep 17 00:00:00 2001
From: ehmaldonado <ehmaldonado@webrtc.org>
Date: Fri, 19 Aug 2016 07:02:24 -0700
Subject: [PATCH] Refactor neteq_test_support.

Take 'tools/neteq_quality_test.cc' and 'tools/neteq_quality_test.h' outside of neteq_test_support into their own target, neteq_quality_test_support.

BUG=webrtc:6228
NOTRY=True

Review-Url: https://codereview.webrtc.org/2252413002
Cr-Commit-Position: refs/heads/master@{#13831}
---
 webrtc/modules/audio_coding/BUILD.gn          | 32 +++++++++++++++----
 .../audio_coding/neteq/neteq_tests.gypi       | 20 +++++++++---
 2 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/webrtc/modules/audio_coding/BUILD.gn b/webrtc/modules/audio_coding/BUILD.gn
index 0491022034..7556bf1f91 100644
--- a/webrtc/modules/audio_coding/BUILD.gn
+++ b/webrtc/modules/audio_coding/BUILD.gn
@@ -1144,8 +1144,6 @@ if (rtc_include_tests) {
       "neteq/tools/neteq_external_decoder_test.h",
       "neteq/tools/neteq_performance_test.cc",
       "neteq/tools/neteq_performance_test.h",
-      "neteq/tools/neteq_quality_test.cc",
-      "neteq/tools/neteq_quality_test.h",
     ]
 
     configs += [ "../..:common_config" ]
@@ -1165,6 +1163,28 @@ if (rtc_include_tests) {
     ]
   }
 
+  source_set("neteq_quality_test_support") {
+    testonly = true
+    sources = [
+      "neteq/tools/neteq_quality_test.cc",
+      "neteq/tools/neteq_quality_test.h",
+    ]
+
+    configs += [ "../..:common_config" ]
+    public_configs = [ "../..:common_inherited_config" ]
+
+    if (is_clang) {
+      # Suppress warnings from the Chromium Clang plugins (bugs.webrtc.org/163).
+      configs -= [ "//build/config/clang:find_bad_constructs" ]
+    }
+
+    deps = [
+      ":neteq",
+      ":neteq_unittest_tools",
+      "//third_party/gflags",
+    ]
+  }
+
   config("neteq_unittest_tools_config") {
     include_dirs = [ "tools" ]
   }
@@ -1402,7 +1422,7 @@ if (rtc_include_tests) {
 
     deps = [
       ":neteq",
-      ":neteq_test_support",
+      ":neteq_quality_test_support",
       ":neteq_unittest_tools",
       ":webrtc_opus",
       "../../test:test_support_main",
@@ -1452,7 +1472,7 @@ if (rtc_include_tests) {
     deps = [
       ":ilbc",
       ":neteq",
-      ":neteq_test_support",
+      ":neteq_quality_test_support",
       ":neteq_unittest_tools",
       "../../system_wrappers:system_wrappers_default",
       "../../test:test_support_main",
@@ -1472,7 +1492,7 @@ if (rtc_include_tests) {
     deps = [
       ":isac_fix",
       ":neteq",
-      ":neteq_test_support",
+      ":neteq_quality_test_support",
       "../../test:test_support_main",
       "//build/config/sanitizers:deps",
       "//testing/gtest",
@@ -1490,7 +1510,7 @@ if (rtc_include_tests) {
     deps = [
       ":g711",
       ":neteq",
-      ":neteq_test_support",
+      ":neteq_quality_test_support",
       "../../test:test_support_main",
       "//build/config/sanitizers:deps",
       "//testing/gtest",
diff --git a/webrtc/modules/audio_coding/neteq/neteq_tests.gypi b/webrtc/modules/audio_coding/neteq/neteq_tests.gypi
index f2b1e8a1b2..5086d0f5e4 100644
--- a/webrtc/modules/audio_coding/neteq/neteq_tests.gypi
+++ b/webrtc/modules/audio_coding/neteq/neteq_tests.gypi
@@ -167,6 +167,18 @@
         'tools/neteq_external_decoder_test.h',
         'tools/neteq_performance_test.cc',
         'tools/neteq_performance_test.h',
+      ],
+    }, # neteq_test_support
+
+    {
+      'target_name': 'neteq_quality_test_support',
+      'type': 'static_library',
+      'dependencies': [
+        '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
+        'neteq',
+        'neteq_unittest_tools',
+      ],
+      'sources': [
         'tools/neteq_quality_test.cc',
         'tools/neteq_quality_test.h',
       ],
@@ -195,7 +207,7 @@
         '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
         '<(webrtc_root)/test/test.gyp:test_support_main',
         'neteq',
-        'neteq_test_support',
+        'neteq_quality_test_support',
         'webrtc_opus',
       ],
       'sources': [
@@ -212,7 +224,7 @@
         '<(webrtc_root)/test/test.gyp:test_support_main',
         'isac_fix',
         'neteq',
-        'neteq_test_support',
+        'neteq_quality_test_support',
       ],
       'sources': [
         'test/neteq_isac_quality_test.cc',
@@ -228,7 +240,7 @@
         '<(webrtc_root)/test/test.gyp:test_support_main',
         'g711',
         'neteq',
-        'neteq_test_support',
+        'neteq_quality_test_support',
       ],
       'sources': [
         'test/neteq_pcmu_quality_test.cc',
@@ -244,7 +256,7 @@
         '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default',
         '<(webrtc_root)/test/test.gyp:test_support_main',
         'neteq',
-        'neteq_test_support',
+        'neteq_quality_test_support',
         'ilbc',
       ],
       'sources': [