From 844ce8bb3ac1c5cbc31dd0026cfaf6694ddee631 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrik=20H=C3=B6glund?= <phoglund@webrtc.org>
Date: Tue, 12 Dec 2017 15:53:31 +0100
Subject: [PATCH] Move unpack_aecdump to a more public location.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This tool is used downstream, so we want to christen rtc_tools as
a kind of api dir for tools. Tools in other locations should be
considered off limits.

I chose rtc_tools because video_quality_toolchain is already there,
which is also used downstream.

Bug: None
Change-Id: I234d874c8a590ca7413357ecda26b16d9b399836
Reviewed-on: https://webrtc-review.googlesource.com/32340
Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org>
Commit-Queue: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21236}
---
 modules/audio_processing/BUILD.gn             | 20 ----------------
 rtc_tools/BUILD.gn                            | 23 ++++++++++++++++++-
 .../unpack_aecdump}/unpack.cc                 |  0
 3 files changed, 22 insertions(+), 21 deletions(-)
 rename {modules/audio_processing/test => rtc_tools/unpack_aecdump}/unpack.cc (100%)

diff --git a/modules/audio_processing/BUILD.gn b/modules/audio_processing/BUILD.gn
index af30f83c38..9ea74b84fc 100644
--- a/modules/audio_processing/BUILD.gn
+++ b/modules/audio_processing/BUILD.gn
@@ -522,7 +522,6 @@ if (rtc_include_tests) {
       deps += [
         ":audioproc_f",
         ":audioproc_unittest_proto",
-        ":unpack_aecdump",
         "aec_dump:aec_dump_unittests",
         "test/conversational_speech",
         "test/py_quality_assessment",
@@ -738,25 +737,6 @@ if (rtc_include_tests) {
   }
 
   if (rtc_enable_protobuf) {
-    rtc_executable("unpack_aecdump") {
-      testonly = true
-      sources = [
-        "test/unpack.cc",
-      ]
-
-      deps = [
-        ":audio_processing",
-        ":audioproc_debug_proto",
-        ":audioproc_protobuf_utils",
-        ":audioproc_test_utils",
-        "../..:webrtc_common",
-        "../../common_audio",
-        "../../rtc_base:protobuf_utils",
-        "../../rtc_base:rtc_base_approved",
-        "../../system_wrappers:system_wrappers_default",
-      ]
-    }  # unpack_aecdump
-
     rtc_executable("audioproc_f") {
       testonly = true
       sources = [
diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn
index 1fbc627e09..e986d564b6 100644
--- a/rtc_tools/BUILD.gn
+++ b/rtc_tools/BUILD.gn
@@ -41,6 +41,7 @@ group("rtc_tools") {
       deps += [
         ":event_log_visualizer",
         ":rtp_analyzer",
+        ":unpack_aecdump",
         "network_tester",
       ]
     }
@@ -371,6 +372,26 @@ if (rtc_include_tests) {
       deps = [
         "../logging:rtc_event_log_proto",
       ]
-    }
+    }  # rtp_analyzer
+
+    rtc_executable("unpack_aecdump") {
+      testonly = true
+      sources = [
+        "unpack_aecdump/unpack.cc",
+      ]
+
+      deps = [
+        "..:webrtc_common",
+        "../common_audio",
+        "../modules/audio_processing",
+        "../modules/audio_processing:audioproc_debug_proto",
+        "../modules/audio_processing:audioproc_debug_proto",
+        "../modules/audio_processing:audioproc_protobuf_utils",
+        "../modules/audio_processing:audioproc_test_utils",
+        "../rtc_base:protobuf_utils",
+        "../rtc_base:rtc_base_approved",
+        "../system_wrappers:system_wrappers_default",
+      ]
+    }  # unpack_aecdump
   }
 }
diff --git a/modules/audio_processing/test/unpack.cc b/rtc_tools/unpack_aecdump/unpack.cc
similarity index 100%
rename from modules/audio_processing/test/unpack.cc
rename to rtc_tools/unpack_aecdump/unpack.cc