Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1666)

Unified Diff: webrtc/modules/audio_coding/neteq/neteq.gypi

Issue 2340773003: GYP: Remove targets inside include_tests==1 that are converted to GN. (Closed)
Patch Set: Removed more and all isolate files. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/modules/audio_coding/codecs/opus/opus.gypi ('k') | webrtc/modules/audio_decoder_unittests.isolate » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/audio_coding/neteq/neteq.gypi
diff --git a/webrtc/modules/audio_coding/neteq/neteq.gypi b/webrtc/modules/audio_coding/neteq/neteq.gypi
index d9c152e184ae52330e6a9aca9ecb3f616d63a364..630076ec8dc35c06c10fcbc088dc06a0e152ccf1 100644
--- a/webrtc/modules/audio_coding/neteq/neteq.gypi
+++ b/webrtc/modules/audio_coding/neteq/neteq.gypi
@@ -134,129 +134,4 @@
],
},
], # targets
- 'conditions': [
- ['include_tests==1', {
- 'includes': ['neteq_tests.gypi',],
- 'targets': [
- {
- 'target_name': 'audio_decoder_unittests',
- 'type': '<(gtest_target_type)',
- 'dependencies': [
- '<@(codecs)',
- 'g722',
- 'ilbc',
- 'isac',
- 'isac_fix',
- 'audio_decoder_interface',
- 'neteq_unittest_tools',
- '<(DEPTH)/testing/gtest.gyp:gtest',
- '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
- '<(webrtc_root)/test/test.gyp:test_support_main',
- ],
- 'defines': [
- '<@(neteq_defines)',
- ],
- 'sources': [
- 'audio_decoder_unittest.cc',
- ],
- 'conditions': [
- ['OS=="android"', {
- 'dependencies': [
- '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
- ],
- }],
- ['OS=="ios"', {
- 'mac_bundle_resources': [
- '<(DEPTH)/resources/audio_coding/testfile32kHz.pcm',
- ],
- }],
- ],
- }, # audio_decoder_unittests
-
- {
- 'target_name': 'rtc_event_log_source',
- 'type': 'static_library',
- 'dependencies': [
- '<(webrtc_root)/webrtc.gyp:rtc_event_log_parser',
- '<(webrtc_root)/webrtc.gyp:rtc_event_log_proto',
- ],
- 'export_dependent_settings': [
- '<(webrtc_root)/webrtc.gyp:rtc_event_log_parser',
- ],
- 'sources': [
- 'tools/rtc_event_log_source.h',
- 'tools/rtc_event_log_source.cc',
- ],
- },
-
- {
- 'target_name': 'neteq_unittest_proto',
- 'type': 'static_library',
- 'sources': [
- 'neteq_unittest.proto',
- ],
- 'variables': {
- 'proto_in_dir': '.',
- # Workaround to protect against gyp's pathname relativization when
- # this file is included by modules.gyp.
- 'proto_out_protected': 'webrtc/audio_coding/neteq',
- 'proto_out_dir': '<(proto_out_protected)',
- },
- 'includes': ['../../../build/protoc.gypi',],
- },
-
- {
- 'target_name': 'neteq_unittest_tools',
- 'type': 'static_library',
- 'dependencies': [
- 'neteq',
- 'rtp_rtcp',
- 'rtc_event_log_source',
- '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
- '<(webrtc_root)/test/test.gyp:rtp_test_utils',
- ],
- 'direct_dependent_settings': {
- 'include_dirs': [
- 'tools',
- ],
- },
- 'include_dirs': [
- 'tools',
- ],
- 'sources': [
- 'tools/audio_checksum.h',
- 'tools/audio_loop.cc',
- 'tools/audio_loop.h',
- 'tools/audio_sink.h',
- 'tools/audio_sink.cc',
- 'tools/constant_pcm_packet_source.cc',
- 'tools/constant_pcm_packet_source.h',
- 'tools/fake_decode_from_file.cc',
- 'tools/fake_decode_from_file.h',
- 'tools/input_audio_file.cc',
- 'tools/input_audio_file.h',
- 'tools/neteq_input.h',
- 'tools/neteq_packet_source_input.cc',
- 'tools/neteq_packet_source_input.h',
- 'tools/neteq_replacement_input.cc',
- 'tools/neteq_replacement_input.h',
- 'tools/neteq_test.cc',
- 'tools/neteq_test.h',
- 'tools/output_audio_file.h',
- 'tools/output_wav_file.h',
- 'tools/packet.cc',
- 'tools/packet.h',
- 'tools/packet_source.cc',
- 'tools/packet_source.h',
- 'tools/resample_input_audio_file.cc',
- 'tools/resample_input_audio_file.h',
- 'tools/rtp_file_source.cc',
- 'tools/rtp_file_source.h',
- 'tools/rtp_generator.cc',
- 'tools/rtp_generator.h',
- ],
- }, # neteq_unittest_tools
- ], # targets
- }], # include_tests
- ], # conditions
}
« no previous file with comments | « webrtc/modules/audio_coding/codecs/opus/opus.gypi ('k') | webrtc/modules/audio_decoder_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698