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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/voice_engine/voice_engine.gyp

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/voice_engine/voe_auto_test.isolate ('k') | webrtc/voice_engine/voice_engine_unittests.isolate » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/voice_engine/voice_engine.gyp
diff --git a/webrtc/voice_engine/voice_engine.gyp b/webrtc/voice_engine/voice_engine.gyp
index 1981ade16f94c8419f84d62ffd4212d01dc013d9..76061dd1687888608da8ae14d51cb7519475ad4a 100644
--- a/webrtc/voice_engine/voice_engine.gyp
+++ b/webrtc/voice_engine/voice_engine.gyp
@@ -165,50 +165,6 @@
], # conditions.
},
{
- 'target_name': 'voice_engine_unittests',
- 'type': '<(gtest_target_type)',
- 'dependencies': [
- 'channel_transport',
- 'voice_engine',
- '<(DEPTH)/testing/gmock.gyp:gmock',
- '<(DEPTH)/testing/gtest.gyp:gtest',
- # The rest are to satisfy the unittests' include chain.
- # This would be unnecessary if we used qualified includes.
- '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
- '<(webrtc_root)/modules/modules.gyp:audio_device',
- '<(webrtc_root)/modules/modules.gyp:audio_processing',
- '<(webrtc_root)/modules/modules.gyp:audio_coding_module',
- '<(webrtc_root)/modules/modules.gyp:audio_conference_mixer',
- '<(webrtc_root)/modules/modules.gyp:media_file',
- '<(webrtc_root)/modules/modules.gyp:rtp_rtcp',
- '<(webrtc_root)/modules/modules.gyp:webrtc_utility',
- '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
- '<(webrtc_root)/test/test.gyp:test_support_main',
- ],
- 'sources': [
- 'channel_unittest.cc',
- 'network_predictor_unittest.cc',
- 'test/channel_transport/udp_transport_unittest.cc',
- 'test/channel_transport/udp_socket_manager_unittest.cc',
- 'test/channel_transport/udp_socket_wrapper_unittest.cc',
- 'transmit_mixer_unittest.cc',
- 'utility_unittest.cc',
- 'voe_audio_processing_unittest.cc',
- 'voe_base_unittest.cc',
- 'voe_codec_unittest.cc',
- 'voe_network_unittest.cc',
- 'voice_engine_fixture.cc',
- 'voice_engine_fixture.h',
- ],
- 'conditions': [
- ['OS=="android"', {
- 'dependencies': [
- '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
- ],
- }],
- ],
- },
- {
# command line test that should work on linux/mac/win
'target_name': 'voe_cmd_test',
'type': 'executable',
@@ -227,153 +183,6 @@
],
},
], # targets
- 'conditions': [
- ['OS!="ios"', {
- 'targets': [
- {
- 'target_name': 'voe_auto_test',
- 'type': 'executable',
- 'dependencies': [
- 'channel_transport',
- 'voice_engine',
- '<(DEPTH)/testing/gmock.gyp:gmock',
- '<(DEPTH)/testing/gtest.gyp:gtest',
- '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
- '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
- '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default',
- '<(webrtc_root)/test/test.gyp:test_common',
- '<(webrtc_root)/test/test.gyp:test_support',
- '<(webrtc_root)/webrtc.gyp:rtc_event_log',
- ],
- 'sources': [
- 'test/auto_test/automated_mode.cc',
- 'test/auto_test/extended/agc_config_test.cc',
- 'test/auto_test/extended/ec_metrics_test.cc',
- 'test/auto_test/fakes/conference_transport.cc',
- 'test/auto_test/fakes/conference_transport.h',
- 'test/auto_test/fakes/loudest_filter.cc',
- 'test/auto_test/fakes/loudest_filter.h',
- 'test/auto_test/fixtures/after_initialization_fixture.cc',
- 'test/auto_test/fixtures/after_initialization_fixture.h',
- 'test/auto_test/fixtures/after_streaming_fixture.cc',
- 'test/auto_test/fixtures/after_streaming_fixture.h',
- 'test/auto_test/fixtures/before_initialization_fixture.cc',
- 'test/auto_test/fixtures/before_initialization_fixture.h',
- 'test/auto_test/fixtures/before_streaming_fixture.cc',
- 'test/auto_test/fixtures/before_streaming_fixture.h',
- 'test/auto_test/standard/audio_processing_test.cc',
- 'test/auto_test/standard/codec_before_streaming_test.cc',
- 'test/auto_test/standard/codec_test.cc',
- 'test/auto_test/standard/dtmf_test.cc',
- 'test/auto_test/standard/external_media_test.cc',
- 'test/auto_test/standard/file_before_streaming_test.cc',
- 'test/auto_test/standard/file_test.cc',
- 'test/auto_test/standard/hardware_before_initializing_test.cc',
- 'test/auto_test/standard/hardware_before_streaming_test.cc',
- 'test/auto_test/standard/hardware_test.cc',
- 'test/auto_test/standard/mixing_test.cc',
- 'test/auto_test/standard/neteq_stats_test.cc',
- 'test/auto_test/standard/rtp_rtcp_before_streaming_test.cc',
- 'test/auto_test/standard/rtp_rtcp_extensions.cc',
- 'test/auto_test/standard/rtp_rtcp_test.cc',
- 'test/auto_test/standard/voe_base_misc_test.cc',
- 'test/auto_test/standard/video_sync_test.cc',
- 'test/auto_test/standard/volume_test.cc',
- 'test/auto_test/resource_manager.cc',
- 'test/auto_test/voe_conference_test.cc',
- 'test/auto_test/voe_cpu_test.cc',
- 'test/auto_test/voe_cpu_test.h',
- 'test/auto_test/voe_output_test.cc',
- 'test/auto_test/voe_standard_test.cc',
- 'test/auto_test/voe_standard_test.h',
- 'test/auto_test/voe_stress_test.cc',
- 'test/auto_test/voe_stress_test.h',
- 'test/auto_test/voe_test_defines.h',
- 'test/auto_test/voe_test_interface.h',
- ],
- 'conditions': [
- ['OS=="android"', {
- # some tests are not supported on android yet, exclude these tests.
- 'sources!': [
- 'test/auto_test/standard/hardware_before_streaming_test.cc',
- ],
- }],
- ['enable_protobuf==1', {
- 'defines': [
- 'ENABLE_RTC_EVENT_LOG',
- ],
- }],
- ],
- # Disable warnings to enable Win64 build, issue 1323.
- 'msvs_disabled_warnings': [
- 4267, # size_t to int truncation.
- ],
- },
- ],
- }],
- ['OS=="android"', {
- 'targets': [
- {
- 'target_name': 'voice_engine_unittests_apk_target',
- 'type': 'none',
- 'dependencies': [
- '<(android_tests_path):voice_engine_unittests_apk',
- ],
- },
- ],
- 'conditions': [
- ['test_isolation_mode != "noop"',
- {
- 'targets': [
- {
- 'target_name': 'voice_engine_unittests_apk_run',
- 'type': 'none',
- 'dependencies': [
- '<(android_tests_path):voice_engine_unittests_apk',
- ],
- 'includes': [
- '../build/isolate.gypi',
- ],
- 'sources': [
- 'voice_engine_unittests_apk.isolate',
- ],
- },
- ],
- },
- ],
- ],
- }],
- ['test_isolation_mode != "noop"', {
- 'targets': [
- {
- 'target_name': 'voice_engine_unittests_run',
- 'type': 'none',
- 'dependencies': [
- 'voice_engine_unittests',
- ],
- 'includes': [
- '../build/isolate.gypi',
- ],
- 'sources': [
- 'voice_engine_unittests.isolate',
- ],
- },
- {
- 'target_name': 'voe_auto_test_run',
- 'type': 'none',
- 'dependencies': [
- 'voe_auto_test',
- ],
- 'includes': [
- '../build/isolate.gypi',
- ],
- 'sources': [
- 'voe_auto_test.isolate',
- ],
- },
- ],
- }],
- ], # conditions
}], # include_tests==1
], # conditions
}
« no previous file with comments | « webrtc/voice_engine/voe_auto_test.isolate ('k') | webrtc/voice_engine/voice_engine_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698