From e3e902eef9dcf94342336cd982076fe69df2db4b Mon Sep 17 00:00:00 2001 From: kjellander Date: Tue, 28 Feb 2017 08:01:46 -0800 Subject: [PATCH] Restructure protobuf targets to fit with downstream requirements. The paths of the protobuf output files needs to match the actual tree path in order for Bazel builds to work. BUG=webrtc:6412 NOTRY=True Review-Url: https://codereview.webrtc.org/2716413004 Cr-Commit-Position: refs/heads/master@{#16912} --- webrtc/modules/audio_coding/BUILD.gn | 2 +- webrtc/modules/audio_coding/neteq/neteq_unittest.cc | 2 +- webrtc/modules/audio_processing/BUILD.gn | 2 +- webrtc/modules/audio_processing/audio_processing_unittest.cc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/webrtc/modules/audio_coding/BUILD.gn b/webrtc/modules/audio_coding/BUILD.gn index 908ed5cf4f..6d1c2f9a00 100644 --- a/webrtc/modules/audio_coding/BUILD.gn +++ b/webrtc/modules/audio_coding/BUILD.gn @@ -1324,7 +1324,7 @@ if (rtc_include_tests) { sources = [ "neteq/neteq_unittest.proto", ] - proto_out_dir = "webrtc/audio_coding/neteq" + proto_out_dir = "webrtc/modules/audio_coding/neteq" } rtc_static_library("rtc_event_log_source") { diff --git a/webrtc/modules/audio_coding/neteq/neteq_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_unittest.cc index b77b734e8a..82529f7dfb 100644 --- a/webrtc/modules/audio_coding/neteq/neteq_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/neteq_unittest.cc @@ -38,7 +38,7 @@ RTC_PUSH_IGNORING_WUNDEF() #ifdef WEBRTC_ANDROID_PLATFORM_BUILD #include "external/webrtc/webrtc/modules/audio_coding/neteq/neteq_unittest.pb.h" #else -#include "webrtc/audio_coding/neteq/neteq_unittest.pb.h" +#include "webrtc/modules/audio_coding/neteq/neteq_unittest.pb.h" #endif RTC_POP_IGNORING_WUNDEF() #endif diff --git a/webrtc/modules/audio_processing/BUILD.gn b/webrtc/modules/audio_processing/BUILD.gn index df272ab73f..bbcc8d018f 100644 --- a/webrtc/modules/audio_processing/BUILD.gn +++ b/webrtc/modules/audio_processing/BUILD.gn @@ -794,7 +794,7 @@ if (rtc_include_tests) { sources = [ "test/unittest.proto", ] - proto_out_dir = "webrtc/modules/audio_processing" + proto_out_dir = "webrtc/modules/audio_processing/test" } rtc_static_library("audioproc_protobuf_utils") { diff --git a/webrtc/modules/audio_processing/audio_processing_unittest.cc b/webrtc/modules/audio_processing/audio_processing_unittest.cc index c5f01f96fb..b52acce230 100644 --- a/webrtc/modules/audio_processing/audio_processing_unittest.cc +++ b/webrtc/modules/audio_processing/audio_processing_unittest.cc @@ -41,7 +41,7 @@ RTC_PUSH_IGNORING_WUNDEF() #ifdef WEBRTC_ANDROID_PLATFORM_BUILD #include "external/webrtc/webrtc/modules/audio_processing/test/unittest.pb.h" #else -#include "webrtc/modules/audio_processing/unittest.pb.h" +#include "webrtc/modules/audio_processing/test/unittest.pb.h" #endif RTC_POP_IGNORING_WUNDEF()