Updated webrtc to fix text relocation issue

submodules/externals/build/webrtc/Android.mk

@@ -1,7 +1,9 @@
 MY_WEBRTC_COMMON_DEFS := \
     -DWEBRTC_ANDROID \
     -DWEBRTC_LINUX \
-    -DWEBRTC_CLOCK_TYPE_REALTIME
+    -DWEBRTC_CLOCK_TYPE_REALTIME \
+    -DWEBRTC_POSIX \
+    -fPIC 
 
 ifneq (,$(findstring armeabi,$(TARGET_ARCH_ABI)))
 MY_WEBRTC_COMMON_DEFS += -DWEBRTC_ARCH_ARM

submodules/externals/build/webrtc/common_audio/signal_processing/Android.mk

@@ -7,7 +7,7 @@
 # be found in the AUTHORS file in the root of the source tree.
 
 MY_WEBRTC_PATH := $(call my-dir)/../../
-LOCAL_PATH := $(MY_WEBRTC_PATH)/../../webrtc/common_audio/signal_processing
+LOCAL_PATH := $(MY_WEBRTC_PATH)/../../webrtc/webrtc/common_audio/signal_processing
 
 include $(CLEAR_VARS)
 
@@ -45,7 +45,6 @@ LOCAL_SRC_FILES := \
     resample_fractional.c \
     spl_init.c \
     spl_sqrt.c \
-    spl_version.c \
     splitting_filter.c \
     sqrt_of_one_minus_x_squared.c \
     vector_scaling_operations.c
@@ -56,19 +55,20 @@ LOCAL_CFLAGS := \
 
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/include \
-    $(LOCAL_PATH)/../.. 
+    $(LOCAL_PATH)/../.. \
+    $(LOCAL_PATH)/../../.. 
 
 ifeq ($(ARCH_ARM_HAVE_ARMV7A),true)
 LOCAL_SRC_FILES += \
-    filter_ar_fast_q12_armv7.s
+    filter_ar_fast_q12_armv7.S
 else
 LOCAL_SRC_FILES += \
     filter_ar_fast_q12.c
 endif
 ifeq ($(TARGET_ARCH),arm)
 LOCAL_SRC_FILES += \
-    complex_bit_reverse_arm.s \
+    complex_bit_reverse_arm.S \
-    spl_sqrt_floor_arm.s
+    spl_sqrt_floor_arm.S
 else
 LOCAL_SRC_FILES += \
     complex_bit_reverse.c \
@@ -103,19 +103,20 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_MODULE := libwebrtc_spl_neon
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := \
-    cross_correlation_neon.s \
+    cross_correlation_neon.c \
-    downsample_fast_neon.s \
+    downsample_fast_neon.c \
-    min_max_operations_neon.s \
+    min_max_operations_neon.c
-    vector_scaling_operations_neon.s
 
 # Flags passed to both C and C++ files.
 LOCAL_CFLAGS := \
     $(MY_WEBRTC_COMMON_DEFS) \
-    $(MY_ARM_CFLAGS_NEON)
+    $(MY_ARM_CFLAGS_NEON) \
+    -mfloat-abi=softfp -mfpu=neon
 
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/include \
-    $(LOCAL_PATH)/../.. 
+    $(LOCAL_PATH)/../.. \
+    $(LOCAL_PATH)/../../.. 
 
 ifndef NDK_ROOT
 include external/stlport/libstlport.mk

submodules/externals/build/webrtc/modules/audio_processing/aecm/Android.mk

@@ -2,7 +2,7 @@
 # Build the non-neon library.
 
 MY_WEBRTC_PATH := $(call my-dir)/../../../
-LOCAL_PATH := $(MY_WEBRTC_PATH)/../../webrtc/modules/audio_processing/aecm
+LOCAL_PATH := $(MY_WEBRTC_PATH)/../../webrtc/webrtc/modules/audio_processing/aecm
 
 include $(CLEAR_VARS)
 
@@ -14,7 +14,8 @@ LOCAL_MODULE := libwebrtc_aecm
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := \
     echo_control_mobile.c \
-    aecm_core.c
+    aecm_core.c \
+    aecm_core_c.c
 
 # Flags passed to both C and C++ files.
 LOCAL_CFLAGS := $(MY_WEBRTC_COMMON_DEFS)
@@ -25,6 +26,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../../.. \
     $(LOCAL_PATH)/../../../common_audio/signal_processing/include \
     $(LOCAL_PATH)/../../../system_wrappers/interface \
+    $(LOCAL_PATH)/../../../.. \
 
 LOCAL_STATIC_LIBRARIES += libwebrtc_system_wrappers
 
@@ -62,7 +64,7 @@ LOCAL_MODULE_TAGS := optional
 #
 #$(LOCAL_PATH)/aecm_core_neon.S: $(LOCAL_PATH)/aecm_core_neon_offsets.h
 
-LOCAL_SRC_FILES := aecm_core_neon.S
+LOCAL_SRC_FILES := aecm_core_neon.c
 
 # Flags passed to both C and C++ files.
 LOCAL_CFLAGS := \
@@ -75,7 +77,8 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/include \
     $(LOCAL_PATH)/../../.. \
     $(LOCAL_PATH)/../../../common_audio/signal_processing/include \
-    $(MY_WEBRTC_PATH)/modules/audio_processing/aecm
+    $(MY_WEBRTC_PATH)/modules/audio_processing/aecm \
+    $(LOCAL_PATH)/../../../.. \
 
 LOCAL_INCLUDES := $(LOCAL_C_INCLUDES)
 

submodules/externals/build/webrtc/modules/audio_processing/utility/Android.mk

@@ -7,7 +7,7 @@
 # be found in the AUTHORS file in the root of the source tree.
 
 MY_WEBRTC_PATH := $(call my-dir)/../../../
-LOCAL_PATH := $(MY_WEBRTC_PATH)/../../webrtc/modules/audio_processing/utility
+LOCAL_PATH := $(MY_WEBRTC_PATH)/../../webrtc/webrtc/modules/audio_processing/utility
 
 include $(CLEAR_VARS)
 
@@ -18,7 +18,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_MODULE := libwebrtc_apm_utility
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := \
-    ring_buffer.c \
+	../../../common_audio/ring_buffer.c \
     delay_estimator.c \
     delay_estimator_wrapper.c
 
@@ -30,7 +30,8 @@ LOCAL_CFLAGS := \
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH) \
     $(LOCAL_PATH)/../../.. \
-    $(LOCAL_PATH)/../../../common_audio/signal_processing/include
+    $(LOCAL_PATH)/../../../common_audio/signal_processing/include \
+    $(LOCAL_PATH)/../../../.. \
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \

submodules/externals/build/webrtc/system_wrappers/Android.mk

@@ -7,7 +7,7 @@
 # be found in the AUTHORS file in the root of the source tree.
 
 MY_WEBRTC_PATH := $(call my-dir)/../
-LOCAL_PATH := $(MY_WEBRTC_PATH)/../../webrtc/system_wrappers/source
+LOCAL_PATH := $(MY_WEBRTC_PATH)/../../webrtc/webrtc/system_wrappers/source
 
 include $(CLEAR_VARS)
 
@@ -33,7 +33,11 @@ LOCAL_SHARED_LIBRARIES := \
     libdl \
     libstlport
     
+LOCAL_STATIC_LIBRARIES := cpufeatures
+
 ifndef NDK_ROOT
 include external/stlport/libstlport.mk
 endif
+
 include $(BUILD_STATIC_LIBRARY)
+$(call import-module,android/cpufeatures)

submodules/externals/webrtc

@@ -1 +1 @@
-Subproject commit 2117f353f82da43f648b10dc6bd99f55e0d44c3f
+Subproject commit a34bb2a78c713e5b9e2224bf7f793d140b0ca608

submodules/mswebrtc

@@ -1 +1 @@
-Subproject commit 5a55409ddce8bc35163662231dae475488dfce75
+Subproject commit 5175b37e3e21ed7dfe1aa32f74fd37f53ecba930