diff options
| author | leozwang@webrtc.org <leozwang@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2011-12-14 23:24:10 +0000 |
|---|---|---|
| committer | leozwang@webrtc.org <leozwang@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2011-12-14 23:24:10 +0000 |
| commit | 69eccc024ac3f0792a0eda9595252f61053e6b0a (patch) | |
| tree | 2417d33221f1a1692f89c2f497886284cd9a273e /Android.mk | |
| parent | 6a17340db55f61f06f6fb5d247c9bbc6fa21f5e1 (diff) | |
| download | webrtc-69eccc024ac3f0792a0eda9595252f61053e6b0a.tar.gz | |
temporarily disable some modules from Android.mk
Review URL: http://webrtc-codereview.appspot.com/324006
git-svn-id: http://webrtc.googlecode.com/svn/trunk@1198 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk index 2380e0bbd5..e2d1e02775 100644 --- a/Android.mk +++ b/Android.mk @@ -39,6 +39,7 @@ 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/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_coding/codecs/vp8/main/source/Android.mk @@ -103,7 +104,6 @@ include $(BUILD_SHARED_LIBRARY) LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -include $(LOCAL_PATH)/../../external/webrtc/android-webrtc.mk LOCAL_ARM_MODE := arm LOCAL_MODULE := libwebrtc @@ -134,7 +134,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ libwebrtc_video_processing \ libwebrtc_vp8 \ libwebrtc_vie_core \ - libwebrtc_vplib \ + libwebrtc_yuv \ libwebrtc_jpeg \ libwebrtc_vpx @@ -147,6 +147,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES += \ libwebrtc_isacfix_neon endif +LOCAL_STATIC_LIBRARIES := \ + libyuv_static + LOCAL_SHARED_LIBRARIES := \ libcutils \ libdl \ @@ -166,7 +169,7 @@ include $(BUILD_SHARED_LIBRARY) # test apps, they're for test only; all these test apps have LOCAL_MODULE_TAGS:=tests # voice engine test apps include $(MY_WEBRTC_ROOT_PATH)/src/voice_engine/main/test/cmd_test/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/src/voice_engine/main/test/auto_test/Android.mk +#include $(MY_WEBRTC_ROOT_PATH)/src/voice_engine/main/test/auto_test/Android.mk # video engien test apps -include $(MY_WEBRTC_ROOT_PATH)/src/video_engine/test/auto_test/android/Android.mk include $(MY_WEBRTC_ROOT_PATH)/src/video_engine/main/test/android_test/Android.mk +#include $(MY_WEBRTC_ROOT_PATH)/src/video_engine/test/auto_test/android/Android.mk |