From c435946ec117d4f2180ef5cd3244ff48ef09d32c Mon Sep 17 00:00:00 2001 From: peah Date: Thu, 1 Sep 2016 22:03:23 -0700 Subject: [PATCH] In order to ensure that the same code is run in the tests as is otherwise run it is important that the same build flags are used in the code being tested. For the debugging functionality inside APM, that was not the case and this is corrected in this CL. This CL is chained to the CL https://codereview.webrtc.org/2300813004/ BUG=webrtc:5298 Review-Url: https://codereview.webrtc.org/2307563002 Cr-Commit-Position: refs/heads/master@{#14031} --- webrtc/modules/BUILD.gn | 6 ++++++ webrtc/modules/modules.gyp | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/webrtc/modules/BUILD.gn b/webrtc/modules/BUILD.gn index 92284a1da6..fb7b2c7254 100644 --- a/webrtc/modules/BUILD.gn +++ b/webrtc/modules/BUILD.gn @@ -477,6 +477,12 @@ if (rtc_include_tests) { "video_processing/test/video_processing_unittest.h", ] + if (apm_debug_dump) { + defines += [ "WEBRTC_APM_DEBUG_DUMP=1" ] + } else { + defines += [ "WEBRTC_APM_DEBUG_DUMP=0" ] + } + if (rtc_enable_intelligibility_enhancer) { defines += [ "WEBRTC_INTELLIGIBILITY_ENHANCER=1" ] sources += [ diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp index 16fb8188c2..3c36d5751b 100644 --- a/webrtc/modules/modules.gyp +++ b/webrtc/modules/modules.gyp @@ -396,6 +396,11 @@ 'video_processing/test/video_processing_unittest.h', ], 'conditions': [ + ['apm_debug_dump==1', { + 'defines': ['WEBRTC_APM_DEBUG_DUMP=1',], + }, { + 'defines': ['WEBRTC_APM_DEBUG_DUMP=0',], + }], ['enable_intelligibility_enhancer==1', { 'defines': ['WEBRTC_INTELLIGIBILITY_ENHANCER=1',], 'sources': [