Some changes made in android makefile

Review URL: http://webrtc-codereview.appspot.com/109003

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

android-webrtc.mk

@@ -28,7 +28,8 @@ MY_WEBRTC_COMMON_DEFS += \
 ifeq ($(ARCH_ARM_HAVE_NEON),true)
 MY_WEBRTC_COMMON_DEFS += \
     '-DWEBRTC_ARCH_ARM_NEON'
-CFLAGS_NEON = -flax-vector-conversions
+MY_ARM_CFLAGS_NEON := \
+    -flax-vector-conversions
 endif
 
 ifeq ($(ARCH_ARM_HAVE_ARMV7A),true)

src/modules/audio_processing/aecm/main/source/Android.mk

@@ -26,8 +26,10 @@ LOCAL_CFLAGS := \
     $(MY_WEBRTC_COMMON_DEFS)
 
 ifeq ($(ARCH_ARM_HAVE_NEON),true)
-    LOCAL_SRC_FILES += aecm_core_neon.c
-    LOCAL_CFLAGS += $(CFLAGS_NEON)
+LOCAL_SRC_FILES += \
+    aecm_core_neon.c
+LOCAL_CFLAGS += \
+    $(MY_ARM_CFLAGS_NEON)
 endif
 
 LOCAL_C_INCLUDES := \

src/modules/audio_processing/ns/main/source/Android.mk

@@ -28,8 +28,10 @@ LOCAL_CFLAGS := \
     $(MY_WEBRTC_COMMON_DEFS)
 
 ifeq ($(ARCH_ARM_HAVE_NEON),true)
-    LOCAL_SRC_FILES += nsx_core_neon.c
-    LOCAL_CFLAGS += $(CFLAGS_NEON)
+LOCAL_SRC_FILES += \
+    nsx_core_neon.c
+LOCAL_CFLAGS += \
+    $(MY_ARM_CFLAGS_NEON)
 endif
 
 LOCAL_C_INCLUDES := \