diff options
author | kma@webrtc.org <kma@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2012-01-04 17:47:57 +0000 |
---|---|---|
committer | kma@webrtc.org <kma@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2012-01-04 17:47:57 +0000 |
commit | 746f9e31c0eec6c0da2bd4cb393e585d46195525 (patch) | |
tree | 1989d85bf3618d60a2db9d54fb9157abb6537010 /android-webrtc.mk | |
parent | 6c1d41583a0770a80a5f98f5c7c0e54e14d19fd1 (diff) | |
download | webrtc-746f9e31c0eec6c0da2bd4cb393e585d46195525.tar.gz |
Changed build settings for ARMv5 in Android.
I found some issues in building ARMv5 with ICM. This CL includes fixes,
and a design change which now will exclude any NEON libraries unless
the build is for dynamic detection or for Neon specifically.
Review URL: http://webrtc-codereview.appspot.com/330021
git-svn-id: http://webrtc.googlecode.com/svn/trunk@1335 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'android-webrtc.mk')
-rw-r--r-- | android-webrtc.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/android-webrtc.mk b/android-webrtc.mk index eb620bb3b4..dc92aeb8e2 100644 --- a/android-webrtc.mk +++ b/android-webrtc.mk @@ -33,6 +33,11 @@ MY_ARM_CFLAGS_NEON := \ -flax-vector-conversions endif +ifneq (,$(filter '-DWEBRTC_DETECT_ARM_NEON' '-DWEBRTC_ARCH_ARM_NEON', \ + $(MY_WEBRTC_COMMON_DEFS))) +WEBRTC_BUILD_NEON_LIBS := true +endif + ifeq ($(ARCH_ARM_HAVE_ARMV7A),true) MY_WEBRTC_COMMON_DEFS += \ '-DWEBRTC_ARCH_ARM_V7A' |