Remove ACM1 and NetEq3 related targets from modules.gyp
Make necessary changes to compile.
BUG=2996
R=turaj@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/18379004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6008 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp
index 8fd0714..444c665 100644
--- a/webrtc/modules/modules.gyp
+++ b/webrtc/modules/modules.gyp
@@ -16,8 +16,7 @@
'audio_coding/codecs/isac/main/source/isac.gypi',
'audio_coding/codecs/isac/fix/source/isacfix.gypi',
'audio_coding/codecs/pcm16b/pcm16b.gypi',
- 'audio_coding/main/source/audio_coding_module.gypi',
- 'audio_coding/neteq/neteq.gypi',
+ 'audio_coding/main/acm2/audio_coding_module.gypi',
'audio_coding/neteq4/neteq.gypi',
'audio_conference_mixer/source/audio_conference_mixer.gypi',
'audio_device/audio_device.gypi',
@@ -76,7 +75,6 @@
'desktop_capture',
'iSACFix',
'media_file',
- 'NetEq',
'NetEq4',
'NetEq4TestTools',
'neteq_unittest_tools',
@@ -107,7 +105,6 @@
'audio_coding/main/acm2/call_statistics_unittest.cc',
'audio_coding/main/acm2/initial_delay_manager_unittest.cc',
'audio_coding/main/acm2/nack_unittest.cc',
- 'audio_coding/main/source/acm_neteq_unittest.cc',
'audio_coding/codecs/cng/cng_unittest.cc',
'audio_coding/codecs/isac/fix/source/filters_unittest.cc',
'audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc',