From f97bfed6c7af152765240a1ca414f967a519500e Mon Sep 17 00:00:00 2001 From: kjellander Date: Thu, 5 Nov 2015 06:02:15 -0800 Subject: [PATCH] Revert of Move audioproc_test_utils into enable_protobuf condition. (patchset #1 id:1 of https://codereview.webrtc.org/1419533010/ ) Reason for revert: I'm going to revert this and https://codereview.webrtc.org/1409943002 to get things back in a good state. Original issue's description: > Move audioproc_test_utils into enable_protobuf condition. > > From https://codereview.webrtc.org/1409943002 this target doesn't > pass GYP on iOS unless build_with_libjingle==1. > Our bots currently build with that, but we want to remove that GYP_DEFINES > from the bots since http://www.webrtc.org/native-code/ios doesn't > say it's needed. > > R=aluebs@webrtc.org > > Committed: https://crrev.com/e2a89251d9a75c2439daddd80f732ab505d0e1b9 > Cr-Commit-Position: refs/heads/master@{#10510} TBR=andrew@webrtc.org,aluebs@webrtc.org,kjellander@webrtc.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.webrtc.org/1428063007 Cr-Commit-Position: refs/heads/master@{#10521} --- .../audio_processing_tests.gypi | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/webrtc/modules/audio_processing/audio_processing_tests.gypi b/webrtc/modules/audio_processing/audio_processing_tests.gypi index 536649d2b0..b301b00e4c 100644 --- a/webrtc/modules/audio_processing/audio_processing_tests.gypi +++ b/webrtc/modules/audio_processing/audio_processing_tests.gypi @@ -8,6 +8,21 @@ { 'targets': [ + { + 'target_name': 'audioproc_test_utils', + 'type': 'static_library', + 'dependencies': [ + 'audioproc_debug_proto', + '<(webrtc_root)/base/base.gyp:rtc_base_approved', + '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', + ], + 'sources': [ + 'test/audio_file_processor.cc', + 'test/audio_file_processor.h', + 'test/test_utils.cc', + 'test/test_utils.h', + ], + }, { 'target_name': 'transient_suppression_test', 'type': 'executable', @@ -65,21 +80,6 @@ 'conditions': [ ['enable_protobuf==1', { 'targets': [ - { - 'target_name': 'audioproc_test_utils', - 'type': 'static_library', - 'dependencies': [ - 'audioproc_debug_proto', - '<(webrtc_root)/base/base.gyp:rtc_base_approved', - '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', - ], - 'sources': [ - 'test/audio_file_processor.cc', - 'test/audio_file_processor.h', - 'test/test_utils.cc', - 'test/test_utils.h', - ], - }, { 'target_name': 'audioproc_unittest_proto', 'type': 'static_library',