| commit | 1c77dfd5215a4a3cca63efc73cb9612fb6d17879 | [log] [tgz] |
|---|---|---|
| author | stefan@webrtc.org <stefan@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | Wed Sep 18 12:34:05 2013 +0000 |
| committer | stefan@webrtc.org <stefan@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | Wed Sep 18 12:34:05 2013 +0000 |
| tree | 28be2668d48e70d779e4f9f2af999ebb82df9520 | |
| parent | 40d3fc65f56579d2f3bb96d20963b15a9378e3c4 [diff] [blame] |
Revert r4772 "Compile ACM1 and ACM2." Breaks Android build. TBR=turaj@webrtc.org Review URL: https://webrtc-codereview.appspot.com/2244004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4777 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/audio_coding/main/test/EncodeDecodeTest.cc b/webrtc/modules/audio_coding/main/test/EncodeDecodeTest.cc index 1ee6abc..bab207c 100644 --- a/webrtc/modules/audio_coding/main/test/EncodeDecodeTest.cc +++ b/webrtc/modules/audio_coding/main/test/EncodeDecodeTest.cc
@@ -20,7 +20,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webrtc/common_types.h" #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h" -#include "webrtc/modules/audio_coding/main/acm2/acm_common_defs.h" +#include "webrtc/modules/audio_coding/main/source/acm_common_defs.h" #include "webrtc/modules/audio_coding/main/test/utility.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/system_wrappers/interface/trace.h"