From 78ddd733b05c20b0f58216f899f5d07c368647b1 Mon Sep 17 00:00:00 2001 From: kjellander Date: Tue, 9 Feb 2016 08:13:06 -0800 Subject: [PATCH] Update path for audioproc_debug proto output. This will make it align with protoc tools that use the relative path from the project root to the files in the output path. Having this, no hacks will need to be applied downstream. TBR=henrik.lundin@webrtc.org NOTRY=True Review URL: https://codereview.webrtc.org/1673263002 Cr-Commit-Position: refs/heads/master@{#11540} --- webrtc/modules/audio_processing/BUILD.gn | 2 +- webrtc/modules/audio_processing/audio_processing.gypi | 2 +- webrtc/modules/audio_processing/audio_processing_impl.cc | 2 +- webrtc/modules/audio_processing/audio_processing_impl.h | 2 +- webrtc/modules/audio_processing/audio_processing_tests.gypi | 2 +- webrtc/modules/audio_processing/test/audio_file_processor.h | 2 +- .../modules/audio_processing/test/audio_processing_unittest.cc | 2 +- webrtc/modules/audio_processing/test/debug_dump_test.cc | 2 +- webrtc/modules/audio_processing/test/process_test.cc | 2 +- webrtc/modules/audio_processing/test/protobuf_utils.h | 2 +- webrtc/modules/audio_processing/test/unpack.cc | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/webrtc/modules/audio_processing/BUILD.gn b/webrtc/modules/audio_processing/BUILD.gn index 9d91911bc2..13da8d6c49 100644 --- a/webrtc/modules/audio_processing/BUILD.gn +++ b/webrtc/modules/audio_processing/BUILD.gn @@ -230,7 +230,7 @@ if (rtc_enable_protobuf) { "debug.proto", ] - proto_out_dir = "webrtc/audio_processing" + proto_out_dir = "webrtc/modules/audio_processing" } } diff --git a/webrtc/modules/audio_processing/audio_processing.gypi b/webrtc/modules/audio_processing/audio_processing.gypi index 7ddd4f5a15..c665f5b0e8 100644 --- a/webrtc/modules/audio_processing/audio_processing.gypi +++ b/webrtc/modules/audio_processing/audio_processing.gypi @@ -229,7 +229,7 @@ 'proto_in_dir': '.', # Workaround to protect against gyp's pathname relativization when # this file is included by modules.gyp. - 'proto_out_protected': 'webrtc/audio_processing', + 'proto_out_protected': 'webrtc/modules/audio_processing', 'proto_out_dir': '<(proto_out_protected)', }, 'includes': ['../../build/protoc.gypi',], diff --git a/webrtc/modules/audio_processing/audio_processing_impl.cc b/webrtc/modules/audio_processing/audio_processing_impl.cc index 0934b1e4af..34937f2095 100644 --- a/webrtc/modules/audio_processing/audio_processing_impl.cc +++ b/webrtc/modules/audio_processing/audio_processing_impl.cc @@ -47,7 +47,7 @@ extern "C" { #ifdef WEBRTC_ANDROID_PLATFORM_BUILD #include "external/webrtc/webrtc/modules/audio_processing/debug.pb.h" #else -#include "webrtc/audio_processing/debug.pb.h" +#include "webrtc/modules/audio_processing/debug.pb.h" #endif #endif // WEBRTC_AUDIOPROC_DEBUG_DUMP diff --git a/webrtc/modules/audio_processing/audio_processing_impl.h b/webrtc/modules/audio_processing/audio_processing_impl.h index 5da3996e33..a19d3fce55 100644 --- a/webrtc/modules/audio_processing/audio_processing_impl.h +++ b/webrtc/modules/audio_processing/audio_processing_impl.h @@ -27,7 +27,7 @@ #ifdef WEBRTC_ANDROID_PLATFORM_BUILD #include "external/webrtc/webrtc/modules/audio_processing/debug.pb.h" #else -#include "webrtc/audio_processing/debug.pb.h" +#include "webrtc/modules/audio_processing/debug.pb.h" #endif #endif // WEBRTC_AUDIOPROC_DEBUG_DUMP diff --git a/webrtc/modules/audio_processing/audio_processing_tests.gypi b/webrtc/modules/audio_processing/audio_processing_tests.gypi index 523602baba..ad82f4bdad 100644 --- a/webrtc/modules/audio_processing/audio_processing_tests.gypi +++ b/webrtc/modules/audio_processing/audio_processing_tests.gypi @@ -85,7 +85,7 @@ 'proto_in_dir': 'test', # Workaround to protect against gyp's pathname relativization when # this file is included by modules.gyp. - 'proto_out_protected': 'webrtc/audio_processing', + 'proto_out_protected': 'webrtc/modules/audio_processing', 'proto_out_dir': '<(proto_out_protected)', }, 'includes': [ '../../build/protoc.gypi', ], diff --git a/webrtc/modules/audio_processing/test/audio_file_processor.h b/webrtc/modules/audio_processing/test/audio_file_processor.h index a3153b2244..3ba20340d2 100644 --- a/webrtc/modules/audio_processing/test/audio_file_processor.h +++ b/webrtc/modules/audio_processing/test/audio_file_processor.h @@ -25,7 +25,7 @@ #ifdef WEBRTC_ANDROID_PLATFORM_BUILD #include "external/webrtc/webrtc/modules/audio_processing/debug.pb.h" #else -#include "webrtc/audio_processing/debug.pb.h" +#include "webrtc/modules/audio_processing/debug.pb.h" #endif namespace webrtc { diff --git a/webrtc/modules/audio_processing/test/audio_processing_unittest.cc b/webrtc/modules/audio_processing/test/audio_processing_unittest.cc index 667ed2aafc..df3273e19a 100644 --- a/webrtc/modules/audio_processing/test/audio_processing_unittest.cc +++ b/webrtc/modules/audio_processing/test/audio_processing_unittest.cc @@ -34,7 +34,7 @@ #include "external/webrtc/webrtc/modules/audio_processing/test/unittest.pb.h" #else #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/audio_processing/unittest.pb.h" +#include "webrtc/modules/audio_processing/unittest.pb.h" #endif namespace webrtc { diff --git a/webrtc/modules/audio_processing/test/debug_dump_test.cc b/webrtc/modules/audio_processing/test/debug_dump_test.cc index 306e9e7f57..e3b375e525 100644 --- a/webrtc/modules/audio_processing/test/debug_dump_test.cc +++ b/webrtc/modules/audio_processing/test/debug_dump_test.cc @@ -13,11 +13,11 @@ #include #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/audio_processing/debug.pb.h" #include "webrtc/base/checks.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/common_audio/channel_buffer.h" #include "webrtc/modules/audio_coding/neteq/tools/resample_input_audio_file.h" +#include "webrtc/modules/audio_processing/debug.pb.h" #include "webrtc/modules/audio_processing/include/audio_processing.h" #include "webrtc/modules/audio_processing/test/protobuf_utils.h" #include "webrtc/modules/audio_processing/test/test_utils.h" diff --git a/webrtc/modules/audio_processing/test/process_test.cc b/webrtc/modules/audio_processing/test/process_test.cc index d987307f19..608fce5fff 100644 --- a/webrtc/modules/audio_processing/test/process_test.cc +++ b/webrtc/modules/audio_processing/test/process_test.cc @@ -33,7 +33,7 @@ #include "external/webrtc/webrtc/modules/audio_processing/debug.pb.h" #else #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/audio_processing/debug.pb.h" +#include "webrtc/modules/audio_processing/debug.pb.h" #endif namespace webrtc { diff --git a/webrtc/modules/audio_processing/test/protobuf_utils.h b/webrtc/modules/audio_processing/test/protobuf_utils.h index 230fcaad76..406f128b3b 100644 --- a/webrtc/modules/audio_processing/test/protobuf_utils.h +++ b/webrtc/modules/audio_processing/test/protobuf_utils.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_TEST_PROTOBUF_UTILS_H_ #define WEBRTC_MODULES_AUDIO_PROCESSING_TEST_PROTOBUF_UTILS_H_ -#include "webrtc/audio_processing/debug.pb.h" #include "webrtc/base/scoped_ptr.h" +#include "webrtc/modules/audio_processing/debug.pb.h" namespace webrtc { diff --git a/webrtc/modules/audio_processing/test/unpack.cc b/webrtc/modules/audio_processing/test/unpack.cc index 8b2b082f97..a1e594ced3 100644 --- a/webrtc/modules/audio_processing/test/unpack.cc +++ b/webrtc/modules/audio_processing/test/unpack.cc @@ -16,9 +16,9 @@ #include #include "gflags/gflags.h" -#include "webrtc/audio_processing/debug.pb.h" #include "webrtc/base/format_macros.h" #include "webrtc/base/scoped_ptr.h" +#include "webrtc/modules/audio_processing/debug.pb.h" #include "webrtc/modules/audio_processing/test/protobuf_utils.h" #include "webrtc/modules/audio_processing/test/test_utils.h" #include "webrtc/typedefs.h"