resolved conflicts for merge of 1b737a98 to master
Change-Id: Id5380390ae5f55c19a07ca0f5d075f135980dc06
diff --git a/Android.mk b/Android.mk
index fbf1722..a6edb3d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -29,7 +29,7 @@
# Add Neon libraries.
ifeq ($(WEBRTC_BUILD_NEON_LIBS),true)
-LOCAL_WHOLE_STATIC_LIBRARIES += \
+LOCAL_WHOLE_STATIC_LIBRARIES_arm += \
libwebrtc_aecm_neon \
libwebrtc_ns_neon
endif
@@ -63,7 +63,7 @@
libwebrtc_spl \
libwebrtc_system_wrappers
ifeq ($(WEBRTC_BUILD_NEON_LIBS),true)
-LOCAL_WHOLE_STATIC_LIBRARIES += \
+LOCAL_WHOLE_STATIC_LIBRARIES_arm += \
libwebrtc_isacfix_neon
endif
@@ -95,7 +95,7 @@
libwebrtc_spl_gnustl_static \
libwebrtc_system_wrappers_gnustl_static
ifeq ($(WEBRTC_BUILD_NEON_LIBS),true)
-LOCAL_WHOLE_STATIC_LIBRARIES += \
+LOCAL_WHOLE_STATIC_LIBRARIES_arm += \
libwebrtc_isacfix_neon_gnustl_static
endif
diff --git a/src/modules/audio_coding/codecs/isac/fix/source/Android.mk b/src/modules/audio_coding/codecs/isac/fix/source/Android.mk
index 5cba53c..3d2c07f 100644
--- a/src/modules/audio_coding/codecs/isac/fix/source/Android.mk
+++ b/src/modules/audio_coding/codecs/isac/fix/source/Android.mk
@@ -112,12 +112,8 @@
-mfloat-abi=softfp \
-flax-vector-conversions
+LOCAL_MODULE_TARGET_ARCH := arm
LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm)
-LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86)
-LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips)
-LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64)
-LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64)
-LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64)
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../interface \
diff --git a/src/modules/audio_coding/codecs/isac/fix/test/Android.mk b/src/modules/audio_coding/codecs/isac/fix/test/Android.mk
index aa8a2d2..e490765 100644
--- a/src/modules/audio_coding/codecs/isac/fix/test/Android.mk
+++ b/src/modules/audio_coding/codecs/isac/fix/test/Android.mk
@@ -42,7 +42,10 @@
libwebrtc_system_wrappers$(MY_LIB_SUFFIX)
ifeq ($(WEBRTC_BUILD_NEON_LIBS),true)
-LOCAL_STATIC_LIBRARIES += \
+# We need to dup libwebrtc_isacfix$(MY_LIB_SUFFIX) because ibwebrtc_isacfix_neon$(MY_LIB_SUFFIX)
+# has dependency on it.
+LOCAL_STATIC_LIBRARIES_arm += \
+ libwebrtc_isacfix$(MY_LIB_SUFFIX) \
libwebrtc_isacfix_neon$(MY_LIB_SUFFIX)
endif
diff --git a/src/modules/audio_processing/aecm/Android.mk b/src/modules/audio_processing/aecm/Android.mk
index 5ccd29f..fff8f52 100644
--- a/src/modules/audio_processing/aecm/Android.mk
+++ b/src/modules/audio_processing/aecm/Android.mk
@@ -81,12 +81,8 @@
-mfloat-abi=softfp \
-flax-vector-conversions
+LOCAL_MODULE_TARGET_ARCH := arm
LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm)
-LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86)
-LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips)
-LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64)
-LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64)
-LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64)
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/interface \
diff --git a/src/modules/audio_processing/ns/Android.mk b/src/modules/audio_processing/ns/Android.mk
index e0a5062..3043e7c 100644
--- a/src/modules/audio_processing/ns/Android.mk
+++ b/src/modules/audio_processing/ns/Android.mk
@@ -83,12 +83,8 @@
-mfloat-abi=softfp \
-flax-vector-conversions
+LOCAL_MODULE_TARGET_ARCH := arm
LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm)
-LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86)
-LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips)
-LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64)
-LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64)
-LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64)
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/interface \