commit e1424e7d531337d79cd2fde97c196c130773d204
author Jorge E. Moreira <jemoreira@google.com> Wed Jul 08 18:07:14 2020 -0700
committer Jorge Moreira Broche <jemoreira@google.com> Mon Jul 20 23:52:24 2020 +0000
tree a6f7f310675856c9228ec22534233ec81159c06a
parent 477c82e10a6e48c0d446b90aaeb9c6dacae5ae3f

Fix include paths

Bug: 153469641
Test: m -j 80
Change-Id: Id365ff5a2ce7229d6237bfa92cb53cbe6da33fd1
Merged-In: Id365ff5a2ce7229d6237bfa92cb53cbe6da33fd1
(cherry picked from commit 8b0a1323e4d769ca9a247cca42be40606d819c4d)

webrtc/modules/audio_processing/audio_processing_impl.cc

diff --git a/webrtc/modules/audio_processing/audio_processing_impl.cc b/webrtc/modules/audio_processing/audio_processing_impl.cc
index 744309c..acd3ab6 100644
--- a/webrtc/modules/audio_processing/audio_processing_impl.cc
+++ b/webrtc/modules/audio_processing/audio_processing_impl.cc
@@ -45,7 +45,7 @@
 #ifdef WEBRTC_AUDIOPROC_DEBUG_DUMP
 // Files generated at build-time by the protobuf compiler.
 #ifdef WEBRTC_ANDROID_PLATFORM_BUILD
-#include "external/webrtc/webrtc/modules/audio_processing/debug.pb.h"
+#include "external/webrtc_legacy/webrtc/modules/audio_processing/debug.pb.h"
 #else
 #include "webrtc/audio_processing/debug.pb.h"
 #endif

webrtc/modules/audio_processing/audio_processing_impl.h

diff --git a/webrtc/modules/audio_processing/audio_processing_impl.h b/webrtc/modules/audio_processing/audio_processing_impl.h
index b310896..39ba72b 100644
--- a/webrtc/modules/audio_processing/audio_processing_impl.h
+++ b/webrtc/modules/audio_processing/audio_processing_impl.h
@@ -25,7 +25,7 @@
 #ifdef WEBRTC_AUDIOPROC_DEBUG_DUMP
 // Files generated at build-time by the protobuf compiler.
 #ifdef WEBRTC_ANDROID_PLATFORM_BUILD
-#include "external/webrtc/webrtc/modules/audio_processing/debug.pb.h"
+#include "external/webrtc_legacy/webrtc/modules/audio_processing/debug.pb.h"
 #else
 #include "webrtc/audio_processing/debug.pb.h"
 #endif

webrtc/modules/audio_processing/test/audio_file_processor.h

diff --git a/webrtc/modules/audio_processing/test/audio_file_processor.h b/webrtc/modules/audio_processing/test/audio_file_processor.h
index a3153b2..7dc9af5 100644
--- a/webrtc/modules/audio_processing/test/audio_file_processor.h
+++ b/webrtc/modules/audio_processing/test/audio_file_processor.h
@@ -23,7 +23,7 @@
 #include "webrtc/system_wrappers/include/tick_util.h"
 
 #ifdef WEBRTC_ANDROID_PLATFORM_BUILD
-#include "external/webrtc/webrtc/modules/audio_processing/debug.pb.h"
+#include "external/webrtc_legacy/webrtc/modules/audio_processing/debug.pb.h"
 #else
 #include "webrtc/audio_processing/debug.pb.h"
 #endif

webrtc/modules/audio_processing/test/process_test.cc

diff --git a/webrtc/modules/audio_processing/test/process_test.cc b/webrtc/modules/audio_processing/test/process_test.cc
index 6e20a78..7aed8df 100644
--- a/webrtc/modules/audio_processing/test/process_test.cc
+++ b/webrtc/modules/audio_processing/test/process_test.cc
@@ -30,7 +30,7 @@
 #include "webrtc/test/testsupport/perf_test.h"
 #ifdef WEBRTC_ANDROID_PLATFORM_BUILD
 #include "gtest/gtest.h"
-#include "external/webrtc/webrtc/modules/audio_processing/debug.pb.h"
+#include "external/webrtc_legacy/webrtc/modules/audio_processing/debug.pb.h"
 #else
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webrtc/audio_processing/debug.pb.h"

webrtc/modules/audio_processing/test/protobuf_utils.h

diff --git a/webrtc/modules/audio_processing/test/protobuf_utils.h b/webrtc/modules/audio_processing/test/protobuf_utils.h
index dc7338c..932fe89 100644
--- a/webrtc/modules/audio_processing/test/protobuf_utils.h
+++ b/webrtc/modules/audio_processing/test/protobuf_utils.h
@@ -12,7 +12,7 @@
 #define WEBRTC_MODULES_AUDIO_PROCESSING_TEST_PROTOBUF_UTILS_H_
 
 #ifdef WEBRTC_ANDROID_PLATFORM_BUILD
-#include "external/webrtc/webrtc/modules/audio_processing/debug.pb.h"
+#include "external/webrtc_legacy/webrtc/modules/audio_processing/debug.pb.h"
 #else
 #include "webrtc/modules/audio_processing/debug.pb.h"
 #endif