diff options
author | Dan Willemsen <dwillemsen@google.com> | 2017-10-26 07:09:50 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-10-26 07:09:50 +0000 |
commit | 9e250bed196cb960855ee7dbac8cf9a35031b03c (patch) | |
tree | dd3271b6e3ec56e7da3f1afae21b5c25b4e7b94c | |
parent | 56ed19de4e08bcd357e1f371240a0a7c8c6f1616 (diff) | |
parent | 353cd3b8aa73ad6bc9d50b32a0d78a63b255caa4 (diff) | |
download | webrtc-9e250bed196cb960855ee7dbac8cf9a35031b03c.tar.gz |
Remove WEBRTC_BUILD_NEON_LIBS am: aa415f46df am: d0febdf096
am: 353cd3b8aa
Change-Id: If557e90a04faec0c458110f1ba9892696de4d922
-rw-r--r-- | Android.mk | 12 | ||||
-rw-r--r-- | android-webrtc.mk | 5 | ||||
-rw-r--r-- | webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk | 38 | ||||
-rw-r--r-- | webrtc/modules/audio_coding/codecs/isac/fix/test/Android.mk | 8 | ||||
-rw-r--r-- | webrtc/modules/audio_processing/aecm/Android.mk | 34 | ||||
-rw-r--r-- | webrtc/modules/audio_processing/ns/Android.mk | 53 |
6 files changed, 0 insertions, 150 deletions
diff --git a/Android.mk b/Android.mk index c4342a5305..77fdadf344 100644 --- a/Android.mk +++ b/Android.mk @@ -35,13 +35,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ libwebrtc_transient \ libwebrtc_vad \ -# Add Neon libraries. -ifeq ($(WEBRTC_BUILD_NEON_LIBS),true) -LOCAL_WHOLE_STATIC_LIBRARIES_arm += \ - libwebrtc_aecm_neon \ - libwebrtc_ns_neon -endif - LOCAL_SHARED_LIBRARIES := \ liblog \ libcutils \ @@ -69,11 +62,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ libwebrtc_spl \ libwebrtc_system_wrappers \ -ifeq ($(WEBRTC_BUILD_NEON_LIBS),true) -LOCAL_WHOLE_STATIC_LIBRARIES_arm += \ - libwebrtc_isacfix_neon -endif - LOCAL_SHARED_LIBRARIES := \ libprotobuf-cpp-lite \ liblog \ diff --git a/android-webrtc.mk b/android-webrtc.mk index a0dfd65fc0..888d4cbb16 100644 --- a/android-webrtc.mk +++ b/android-webrtc.mk @@ -35,11 +35,6 @@ MY_WEBRTC_COMMON_DEFS_arm := \ # -flax-vector-conversions #endif # -#ifneq (,$(filter '-DWEBRTC_DETECT_ARM_NEON' '-DWEBRTC_ARCH_ARM_NEON', \ -# $(MY_WEBRTC_COMMON_DEFS_arm))) -#WEBRTC_BUILD_NEON_LIBS := true -#endif -# #ifeq ($(ARCH_ARM_HAVE_ARMV7A),true) #MY_WEBRTC_COMMON_DEFS_arm += \ # '-DWEBRTC_ARCH_ARM_V7A' 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 diff --git a/webrtc/modules/audio_processing/aecm/Android.mk b/webrtc/modules/audio_processing/aecm/Android.mk index fcc3933f5d..2bf7ac65f9 100644 --- a/webrtc/modules/audio_processing/aecm/Android.mk +++ b/webrtc/modules/audio_processing/aecm/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) @@ -50,34 +47,3 @@ LOCAL_C_INCLUDES := \ LOCAL_STATIC_LIBRARIES += libwebrtc_system_wrappers 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_aecm_neon -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES := aecm_core_neon.c - -# Flags passed to both C and C++ files. -LOCAL_CFLAGS := \ - $(MY_WEBRTC_COMMON_DEFS) \ - -flax-vector-conversions - -LOCAL_MODULE_TARGET_ARCH := arm -LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/include \ - $(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_processing/ns/Android.mk b/webrtc/modules/audio_processing/ns/Android.mk index 69f1c146a5..d76bcc78e0 100644 --- a/webrtc/modules/audio_processing/ns/Android.mk +++ b/webrtc/modules/audio_processing/ns/Android.mk @@ -6,8 +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) @@ -52,54 +50,3 @@ LOCAL_C_INCLUDES := \ LOCAL_STATIC_LIBRARIES += libwebrtc_system_wrappers 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_ns_neon -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_TAGS := optional - -ifeq ($(TARGET_ARCH), arm64) -# new nsx_core_neon.S does not compile with clang or gas. -LOCAL_SRC_FILES := nsx_core_neon.c - -else -GEN := $(LOCAL_PATH)/nsx_core_neon_offsets.h - -# Generate a header file nsx_core_neon_offsets.h which will be included in -# assembly file nsx_core_neon.S, from file nsx_core_neon_offsets.c. -$(GEN): $(LOCAL_PATH)/../../../../webrtc/build/generate_asm_header.py \ - $(intermediates)/nsx_core_neon_offsets.S - @python $^ $@ offset_nsx_ - -$(intermediates)/nsx_core_neon_offsets.S: $(LOCAL_PATH)/nsx_core_neon_offsets.c - @$(TARGET_CC) $(addprefix -I, $(LOCAL_INCLUDES)) $(addprefix -isystem ,\ - $(TARGET_C_INCLUDES)) -S -o $@ $^ - -LOCAL_GENERATED_SOURCES := $(GEN) -LOCAL_SRC_FILES := nsx_core_neon.S -endif - -# Flags passed to both C and C++ files. -LOCAL_CFLAGS := \ - $(MY_WEBRTC_COMMON_DEFS) \ - -flax-vector-conversions - -LOCAL_MODULE_TARGET_ARCH := arm -LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/include \ - $(LOCAL_PATH)/../../.. \ - $(LOCAL_PATH)/../../../common_audio/signal_processing/include - -LOCAL_INCLUDES := $(LOCAL_C_INCLUDES) - -include $(BUILD_STATIC_LIBRARY) -endif # ifeq ($(WEBRTC_BUILD_NEON_LIBS),true) |