2 files changed, 0 insertions, 46 deletions
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk b/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk
index 709874c277..cac1b2a0cf 100644
--- a/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk
+++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk
@@ -6,9 +6,6 @@
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
-#############################
-# Build the non-neon library.
-
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
@@ -84,38 +81,3 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include
 
 include $(BUILD_STATIC_LIBRARY)
-
-#########################
-# Build the neon library.
-ifeq ($(WEBRTC_BUILD_NEON_LIBS),true)
-
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := libwebrtc_isacfix_neon
-LOCAL_VENDOR_MODULE := true
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := \
-    filters_neon.c \
-    lattice_neon.S \
-    lpc_masking_model_neon.S
-
-# Flags passed to both C and C++ files.
-LOCAL_CFLAGS := \
-    $(MY_WEBRTC_COMMON_DEFS) \
-    -mfpu=neon \
-    -mfloat-abi=softfp \
-    -flax-vector-conversions
-
-LOCAL_MODULE_TARGET_ARCH := arm
-LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm)
-
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../interface \
-    $(LOCAL_PATH)/../../../../../../.. \
-    $(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include
-
-include $(BUILD_STATIC_LIBRARY)
-
-endif # ifeq ($(WEBRTC_BUILD_NEON_LIBS),true)
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/test/Android.mk b/webrtc/modules/audio_coding/codecs/isac/fix/test/Android.mk
index 48e56c5f34..161ade83cf 100644
--- a/webrtc/modules/audio_coding/codecs/isac/fix/test/Android.mk
+++ b/webrtc/modules/audio_coding/codecs/isac/fix/test/Android.mk
@@ -39,14 +39,6 @@ LOCAL_STATIC_LIBRARIES := \
     libwebrtc_spl \
     libwebrtc_system_wrappers
 
-ifeq ($(WEBRTC_BUILD_NEON_LIBS),true)
-# We need to dup libwebrtc_isacfix because ibwebrtc_isacfix_neon
-# has dependency on it.
-LOCAL_STATIC_LIBRARIES_arm += \
-    libwebrtc_isacfix \
-    libwebrtc_isacfix_neon
-endif
-
 LOCAL_SHARED_LIBRARIES := \
     libutils