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

src/modules/audio_coding/codecs/iSAC/fix/source/Android.mk

@@ -52,7 +52,7 @@ LOCAL_CFLAGS := \
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../interface \
     $(LOCAL_PATH)/../../../../../.. \
-    $(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include 
+    $(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \
@@ -66,6 +66,7 @@ include $(BUILD_STATIC_LIBRARY)
 
 #########################
 # Build the neon library.
+ifeq ($(WEBRTC_BUILD_NEON_LIBS),true)
 
 include $(CLEAR_VARS)
 
@@ -76,13 +77,12 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := \
     filters_neon.c \
     lattice_neon.S #.S extention is for including a header file in assembly.
-# TODO(kma): Check with C compiler team and on line community for any status
-# in the file name (.s vs .S), for a better solution.
 
 # Flags passed to both C and C++ files.
 LOCAL_CFLAGS := \
     $(MY_WEBRTC_COMMON_DEFS) \
     -mfpu=neon \
+    -mfloat-abi=softfp \
     -flax-vector-conversions
 
 LOCAL_C_INCLUDES := \
@@ -96,6 +96,8 @@ include external/stlport/libstlport.mk
 endif
 include $(BUILD_STATIC_LIBRARY)
 
+endif # ifeq ($(WEBRTC_BUILD_NEON_LIBS),true)
+
 ###########################
 # isac test app
 
@@ -114,9 +116,13 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_STATIC_LIBRARIES := \
     libwebrtc_isacfix \
-    libwebrtc_isacfix_neon \
     libwebrtc_spl
 
+ifeq ($(WEBRTC_BUILD_NEON_LIBS),true)
+LOCAL_STATIC_LIBRARIES += \
+    libwebrtc_isacfix_neon
+endif
+
 LOCAL_SHARED_LIBRARIES := \
     libutils