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

Remove libvpx_intrinsics_sse4_1.a in Android.mk since this target is no longer generated in libvpx

Browse Source 
R=fischman@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1569004

Patch from Jeremy Mao <yujie.mao@intel.com>.

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4114 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
fischman@webrtc.org 2013-05-28 05:49:43 +00:00
parent a6db54d4c9
commit 68c05f498c
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
webrtc/video_engine/test/android/jni/Android.mk
View File

@ -291,20 +291,13 @@ ifeq ($(APP_ABI), x86) # x86 Android specific
$(MY_LIBS_PATH)/libvpx_intrinsics_ssse3.a $(MY_LIBS_PATH)/libvpx_intrinsics_ssse3.a
include $(PREBUILT_STATIC_LIBRARY) include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := libvpx_intrinsics_sse4_1
LOCAL_SRC_FILES := \
$(MY_LIBS_PATH)/libvpx_intrinsics_sse4_1.a
include $(PREBUILT_STATIC_LIBRARY)
LOCAL_PLATFORM_SPECIFIC_STATIC_LIBRARIES := \ LOCAL_PLATFORM_SPECIFIC_STATIC_LIBRARIES := \
libvideo_processing_sse2 \ libvideo_processing_sse2 \
libaudio_processing_sse2 \ libaudio_processing_sse2 \
libcommon_audio_sse2 \ libcommon_audio_sse2 \
libvpx_intrinsics_mmx \ libvpx_intrinsics_mmx \
libvpx_intrinsics_sse2 \ libvpx_intrinsics_sse2 \
libvpx_intrinsics_ssse3 \ libvpx_intrinsics_ssse3
libvpx_intrinsics_sse4_1
else # arm Android specific else # arm Android specific
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libaudio_processing_neon LOCAL_MODULE := libaudio_processing_neon
@ -365,7 +358,7 @@ LOCAL_LDLIBS := \
# TODO(yujie.mao): Replace LOCAL_WHOLE_STATIC_LIBRARIES to # TODO(yujie.mao): Replace LOCAL_WHOLE_STATIC_LIBRARIES to
# LOCAL_STATIC_LIBRARIES after removing the circular dependencies between # LOCAL_STATIC_LIBRARIES after removing the circular dependencies between
# libvpx.a and libvpx_intrinsics_[mmx,sse2,ssse3,sse4_1].a # libvpx.a and libvpx_intrinsics_[mmx,sse2,ssse3].a
LOCAL_WHOLE_STATIC_LIBRARIES := \ LOCAL_WHOLE_STATIC_LIBRARIES := \
libvoice_engine_core \ libvoice_engine_core \
libvideo_engine_core \ libvideo_engine_core \