generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Enable all modules without building errors

Browse Source 
Review URL: https://webrtc-codereview.appspot.com/360004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1485 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
leozwang@webrtc.org 2012-01-19 22:11:37 +00:00
parent 2d03b8b217
commit a191506ce9
3 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Android.mk
View File

@ -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/resampler/Android.mk
include $(MY_WEBRTC_ROOT_PATH)/src/common_audio/signal_processing/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/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/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/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/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/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/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/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/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/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_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_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_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/aec/Android.mk
include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/aecm/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/agc/Android.mk
include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/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/ns/Android.mk
include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/utility/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/media_file/source/Android.mk
#include $(MY_WEBRTC_ROOT_PATH)/src/modules/rtp_rtcp/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/udp_transport/source/Android.mk
#include $(MY_WEBRTC_ROOT_PATH)/src/modules/utility/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/system_wrappers/source/Android.mk
#include $(MY_WEBRTC_ROOT_PATH)/src/voice_engine/main/source/Android.mk #include $(MY_WEBRTC_ROOT_PATH)/src/voice_engine/main/source/Android.mk
# video # video
#include $(MY_WEBRTC_ROOT_PATH)/src/common_video/jpeg/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/vplib/main/source/Android.mk
#include $(MY_WEBRTC_ROOT_PATH)/src/common_video/libyuv/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_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/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/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_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_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_render/main/source/Android.mk
#include $(MY_WEBRTC_ROOT_PATH)/src/video_engine/Android.mk #include $(MY_WEBRTC_ROOT_PATH)/src/video_engine/Android.mk
# third party # third party

1
src/modules/video_capture/main/source/Android.mk
View File

@ -19,7 +19,6 @@ LOCAL_MODULE_TAGS := optional
LOCAL_CPP_EXTENSION := .cc LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
video_capture_impl.cc \ video_capture_impl.cc \
vplib_conversions.cc \
device_info_impl.cc \ device_info_impl.cc \
video_capture_factory.cc \ video_capture_factory.cc \
Android/video_capture_android.cc \ Android/video_capture_android.cc \

4
src/modules/video_processing/main/source/Android.mk
View File

@ -25,8 +25,8 @@ LOCAL_SRC_FILES := \
denoising.cc \ denoising.cc \
frame_preprocessor.cc \ frame_preprocessor.cc \
spatial_resampler.cc \ spatial_resampler.cc \
video_decimator.cc video_decimator.cc \
video_processing_impl.cc \ video_processing_impl.cc
ifeq ($(TARGET_ARCH),x86) ifeq ($(TARGET_ARCH),x86)
LOCAL_SRC_FILES += \ LOCAL_SRC_FILES += \