diff options
| author | michaelbai@google.com <michaelbai@google.com@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-02-05 18:43:46 +0000 |
|---|---|---|
| committer | michaelbai@google.com <michaelbai@google.com@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-02-05 18:43:46 +0000 |
| commit | f928f5c87c508ee9e8b1782b96a2a198f80ea592 (patch) | |
| tree | 5d3160f9d8b71207d45751dd86077056cfcbbf6c /webrtc/system_wrappers/source/Android.mk | |
| parent | c88d3368d5d125ef932816b8fced621b1cc26f8a (diff) | |
| download | webrtc-f928f5c87c508ee9e8b1782b96a2a198f80ea592.tar.gz | |
Use system's cpu_features library
Remove the copied cpu_featrues.c/h
Use the NDK's cpu_features.a or the one build from android source.
This issue blocked libvpx roll.
BUG=334447
R=andrew@webrtc.org, fischman@webrtc.org, henrike@webrtc.org, wjia@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/8019004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@5492 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc/system_wrappers/source/Android.mk')
| -rw-r--r-- | webrtc/system_wrappers/source/Android.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webrtc/system_wrappers/source/Android.mk b/webrtc/system_wrappers/source/Android.mk index 6cc7a0bac2..f48019d6a5 100644 --- a/webrtc/system_wrappers/source/Android.mk +++ b/webrtc/system_wrappers/source/Android.mk @@ -17,7 +17,6 @@ LOCAL_MODULE := libwebrtc_system_wrappers LOCAL_MODULE_TAGS := optional LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES := \ - android/cpu-features.c \ cpu_features_android.c \ sort.cc \ aligned_malloc.cc \ @@ -56,6 +55,8 @@ LOCAL_SHARED_LIBRARIES := \ libdl \ libstlport +LOCAL_STATIC_LIBRARIES := cpufeatures + ifndef NDK_ROOT include external/stlport/libstlport.mk endif |