admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update path for audioproc_debug proto output.

Browse Source 
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}
This commit is contained in:
kjellander 2016-02-09 08:13:06 -08:00 committed by Commit bot
parent 4bba35f735
commit 78ddd733b0
11 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/modules/audio_processing/BUILD.gn
View File

@ -230,7 +230,7 @@ if (rtc_enable_protobuf) {
"debug.proto",
]
proto_out_dir = "webrtc/audio_processing"
proto_out_dir = "webrtc/modules/audio_processing"
}
}

2
webrtc/modules/audio_processing/audio_processing.gypi
View File

@ -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',],

2
webrtc/modules/audio_processing/audio_processing_impl.cc
View File

@ -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

2
webrtc/modules/audio_processing/audio_processing_impl.h
View File

@ -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

2
webrtc/modules/audio_processing/audio_processing_tests.gypi
View File

@ -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', ],

2
webrtc/modules/audio_processing/test/audio_file_processor.h
View File

@ -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 {

2
webrtc/modules/audio_processing/test/audio_processing_unittest.cc
View File

@ -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 {

2
webrtc/modules/audio_processing/test/debug_dump_test.cc
View File

@ -13,11 +13,11 @@
#include <vector>
#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"

2
webrtc/modules/audio_processing/test/process_test.cc
View File

@ -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 {

2
webrtc/modules/audio_processing/test/protobuf_utils.h
View File

@ -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 {

2
webrtc/modules/audio_processing/test/unpack.cc
View File

@ -16,9 +16,9 @@
#include <stdio.h>
#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"