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

Unified Diff: webrtc/voice_engine/voice_engine.gyp

Issue 2245413002: Revert of Move FilePlayer and FileRecorder to Voice Engine (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 4 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/transmit_mixer.h ('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 8103f8394fdbc7c536393a67de3bb8af6f0d9d6f..912b5228c1b267059d9303bb00c3fdbf5fb61fb3 100644
--- a/webrtc/voice_engine/voice_engine.gyp
+++ b/webrtc/voice_engine/voice_engine.gyp
@@ -29,8 +29,6 @@
'<(webrtc_root)/modules/modules.gyp:webrtc_utility',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
'<(webrtc_root)/webrtc.gyp:rtc_event_log',
- 'file_player',
- 'file_recorder',
'level_indicator',
],
'export_dependent_settings': [
@@ -97,53 +95,6 @@
],
},
{
- 'target_name': 'audio_coder',
- 'type': 'static_library',
- 'sources': [
- 'coder.cc',
- 'coder.h',
- ],
- 'dependencies': [
- '<(webrtc_root)/common.gyp:webrtc_common',
- '<(webrtc_root)/modules/modules.gyp:audio_coding_module',
- '<(webrtc_root)/modules/modules.gyp:builtin_audio_decoder_factory',
- '<(webrtc_root)/modules/modules.gyp:rent_a_codec',
- ],
- },
- {
- 'target_name': 'file_player',
- 'type': 'static_library',
- 'sources': [
- 'file_player.h',
- 'file_player_impl.cc',
- 'file_player_impl.h',
- ],
- 'dependencies': [
- '<(webrtc_root)/common.gyp:webrtc_common',
- '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
- '<(webrtc_root)/modules/modules.gyp:media_file',
- '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
- 'audio_coder',
- ],
- },
- {
- 'target_name': 'file_recorder',
- 'type': 'static_library',
- 'sources': [
- 'file_recorder.h',
- 'file_recorder_impl.cc',
- 'file_recorder_impl.h',
- ],
- 'dependencies': [
- '<(webrtc_root)/base/base.gyp:rtc_base_approved',
- '<(webrtc_root)/common.gyp:webrtc_common',
- '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
- '<(webrtc_root)/modules/modules.gyp:media_file',
- '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
- 'audio_coder',
- ],
- },
- {
'target_name': 'level_indicator',
'type': 'static_library',
'dependencies': [
@@ -170,7 +121,6 @@
'voice_engine',
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(DEPTH)/testing/gtest.gyp:gtest',
- '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
# 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',
@@ -186,7 +136,6 @@
],
'sources': [
'channel_unittest.cc',
- 'file_player_unittests.cc',
'network_predictor_unittest.cc',
'transmit_mixer_unittest.cc',
'utility_unittest.cc',
@@ -201,12 +150,6 @@
['OS=="android"', {
'dependencies': [
'<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
- ],
- }],
- ['OS=="ios"', {
- 'mac_bundle_resources': [
- '<(DEPTH)/resources/utility/encapsulated_pcm16b_8khz.wav',
- '<(DEPTH)/resources/utility/encapsulated_pcmu_8khz.wav',
],
}],
],
« no previous file with comments | « webrtc/voice_engine/transmit_mixer.h ('k') | webrtc/voice_engine/voice_engine_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698