diff options
| -rw-r--r-- | android-webrtc.mk | 3 | ||||
| -rw-r--r-- | src/modules/audio_processing/aecm/main/source/Android.mk | 6 | ||||
| -rw-r--r-- | src/modules/audio_processing/ns/main/source/Android.mk | 6 |
3 files changed, 10 insertions, 5 deletions
diff --git a/android-webrtc.mk b/android-webrtc.mk index e0d837e4e1..9a8c861b73 100644 --- a/android-webrtc.mk +++ b/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) diff --git a/src/modules/audio_processing/aecm/main/source/Android.mk b/src/modules/audio_processing/aecm/main/source/Android.mk index b295061fc9..9e74623ae4 100644 --- a/src/modules/audio_processing/aecm/main/source/Android.mk +++ b/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 := \ diff --git a/src/modules/audio_processing/ns/main/source/Android.mk b/src/modules/audio_processing/ns/main/source/Android.mk index cdb7b9d7d2..19b6722884 100644 --- a/src/modules/audio_processing/ns/main/source/Android.mk +++ b/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 := \ |