aboutsummaryrefslogtreecommitdiff
path: root/Android.mk
diff options
context:
space:
mode:
authorleozwang@webrtc.org <leozwang@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2012-01-19 22:11:37 +0000
committerleozwang@webrtc.org <leozwang@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2012-01-19 22:11:37 +0000
commita191506ce97d2cff219567beedcc22642615d7c7 (patch)
tree547d85f8b772ddb5fbe6bb0a596d9db3dcdf1f31 /Android.mk
parent2d03b8b2178db1ea4458d84f9208c80114849131 (diff)
downloadwebrtc-a191506ce97d2cff219567beedcc22642615d7c7.tar.gz
Enable all modules without building errors
Review URL: https://webrtc-codereview.appspot.com/360004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1485 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk41
1 files changed, 20 insertions, 21 deletions
diff --git a/Android.mk b/Android.mk
index 511fa0ab6b..2abae3faa2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -12,40 +12,39 @@ MY_WEBRTC_ROOT_PATH := $(call my-dir)
include $(MY_WEBRTC_ROOT_PATH)/src/common_audio/resampler/Android.mk
include $(MY_WEBRTC_ROOT_PATH)/src/common_audio/signal_processing/Android.mk
include $(MY_WEBRTC_ROOT_PATH)/src/common_audio/vad/Android.mk
-#include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/neteq/Android.mk
-#include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/cng/Android.mk
-#include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/g711/Android.mk
-#include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/g722/Android.mk
-#include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/pcm16b/Android.mk
-#include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/ilbc/Android.mk
-#include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/iSAC/fix/source/Android.mk
-#include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/iSAC/main/source/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/neteq/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/cng/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/g711/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/g722/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/pcm16b/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/ilbc/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/iSAC/fix/source/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/iSAC/main/source/Android.mk
#include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/main/source/Android.mk
-#include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_conference_mixer/source/Android.mk
-#include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_device/main/source/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_conference_mixer/source/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_device/main/source/Android.mk
include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/aec/Android.mk
include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/aecm/Android.mk
include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/agc/Android.mk
include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/Android.mk
include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/ns/Android.mk
include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/utility/Android.mk
-#include $(MY_WEBRTC_ROOT_PATH)/src/modules/media_file/source/Android.mk
-#include $(MY_WEBRTC_ROOT_PATH)/src/modules/rtp_rtcp/source/Android.mk
-#include $(MY_WEBRTC_ROOT_PATH)/src/modules/udp_transport/source/Android.mk
-#include $(MY_WEBRTC_ROOT_PATH)/src/modules/utility/source/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/media_file/source/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/rtp_rtcp/source/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/udp_transport/source/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/utility/source/Android.mk
include $(MY_WEBRTC_ROOT_PATH)/src/system_wrappers/source/Android.mk
#include $(MY_WEBRTC_ROOT_PATH)/src/voice_engine/main/source/Android.mk
# video
-#include $(MY_WEBRTC_ROOT_PATH)/src/common_video/jpeg/main/source/Android.mk
-#include $(MY_WEBRTC_ROOT_PATH)/src/common_video/vplib/main/source/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/common_video/jpeg/main/source/Android.mk
#include $(MY_WEBRTC_ROOT_PATH)/src/common_video/libyuv/Android.mk
-#include $(MY_WEBRTC_ROOT_PATH)/src/modules/video_capture/main/source/Android.mk
-#include $(MY_WEBRTC_ROOT_PATH)/src/modules/video_coding/codecs/i420/main/source/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/video_capture/main/source/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/video_coding/codecs/i420/main/source/Android.mk
#include $(MY_WEBRTC_ROOT_PATH)/src/modules/video_coding/codecs/vp8/main/source/Android.mk
-#include $(MY_WEBRTC_ROOT_PATH)/src/modules/video_coding/main/source/Android.mk
-#include $(MY_WEBRTC_ROOT_PATH)/src/modules/video_processing/main/source/Android.mk
-#include $(MY_WEBRTC_ROOT_PATH)/src/modules/video_render/main/source/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/video_coding/main/source/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/video_processing/main/source/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/video_render/main/source/Android.mk
#include $(MY_WEBRTC_ROOT_PATH)/src/video_engine/Android.mk
# third party