Changed a flag in ARM build for platform build.

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2722 4adac7df-926f-26a2-2b94-8c16560cd09d

Author: [email protected]

android-webrtc.mk

@@ -34,8 +34,8 @@ endif
 ifneq (,$(filter '-DWEBRTC_DETECT_ARM_NEON' '-DWEBRTC_ARCH_ARM_NEON', \
     $(MY_WEBRTC_COMMON_DEFS)))
 WEBRTC_BUILD_NEON_LIBS := true
-# TODO(kma): Use MY_WEBRTC_COMMON_DEFS for Neon libraies in AECM, NS, and iSAC.
-MY_WEBRTC_COMMON_DEFS += \
+# TODO(kma): Use MY_ARM_CFLAGS_NEON for Neon libraies in AECM, NS, and iSAC.
+MY_ARM_CFLAGS_NEON := \
     -mfpu=neon \
     -mfloat-abi=softfp \
     -flax-vector-conversions

src/common_audio/signal_processing/Android.mk

@@ -106,7 +106,9 @@ LOCAL_SRC_FILES := \
     vector_scaling_operations_neon.s
 
 # Flags passed to both C and C++ files.
-LOCAL_CFLAGS := $(MY_WEBRTC_COMMON_DEFS)
+LOCAL_CFLAGS := \
+    $(MY_WEBRTC_COMMON_DEFS) \
+    $(MY_ARM_CFLAGS_NEON)
 
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/include \