zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove WEBRTC_BUILD_NEON_LIBS am: aa415f46df

Browse Source 
am: d0febdf096

Change-Id: Idd524e65c7ecb3bc0bcc6b07c876d91e19d10ea3
This commit is contained in:
Dan Willemsen
2017-10-26 07:05:37 +00:00
committed by android-build-merger
parent 825d470d20 d0febdf096
commit 353cd3b8aa
6 changed files with 0 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Android.mk
View File

@ -35,13 +35,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
libwebrtc_transient \ libwebrtc_transient \
libwebrtc_vad \ 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 := \ LOCAL_SHARED_LIBRARIES := \
liblog \ liblog \
libcutils \ libcutils \
@ -69,11 +62,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
libwebrtc_spl \ libwebrtc_spl \
libwebrtc_system_wrappers \ libwebrtc_system_wrappers \
ifeq ($(WEBRTC_BUILD_NEON_LIBS),true)
LOCAL_WHOLE_STATIC_LIBRARIES_arm += \
libwebrtc_isacfix_neon
endif
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libprotobuf-cpp-lite \ libprotobuf-cpp-lite \
liblog \ liblog \

5
android-webrtc.mk
View File

@ -35,11 +35,6 @@ MY_WEBRTC_COMMON_DEFS_arm := \
# -flax-vector-conversions # -flax-vector-conversions
#endif #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) #ifeq ($(ARCH_ARM_HAVE_ARMV7A),true)
#MY_WEBRTC_COMMON_DEFS_arm += \ #MY_WEBRTC_COMMON_DEFS_arm += \
# '-DWEBRTC_ARCH_ARM_V7A' # '-DWEBRTC_ARCH_ARM_V7A'

38
webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk
View File

@ -6,9 +6,6 @@
# in the file PATENTS. All contributing project authors may # in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
#############################
# Build the non-neon library.
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
@ -84,38 +81,3 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include $(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include
include $(BUILD_STATIC_LIBRARY) 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)

8
webrtc/modules/audio_coding/codecs/isac/fix/test/Android.mk
View File

@ -39,14 +39,6 @@ LOCAL_STATIC_LIBRARIES := \
libwebrtc_spl \ libwebrtc_spl \
libwebrtc_system_wrappers 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 := \ LOCAL_SHARED_LIBRARIES := \
libutils libutils

34
webrtc/modules/audio_processing/aecm/Android.mk
View File

@ -6,9 +6,6 @@
# in the file PATENTS. All contributing project authors may # in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
#############################
# Build the non-neon library.
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
@ -50,34 +47,3 @@ LOCAL_C_INCLUDES := \
LOCAL_STATIC_LIBRARIES += libwebrtc_system_wrappers LOCAL_STATIC_LIBRARIES += libwebrtc_system_wrappers
include $(BUILD_STATIC_LIBRARY) 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)

53
webrtc/modules/audio_processing/ns/Android.mk
View File

@ -6,8 +6,6 @@
# in the file PATENTS. All contributing project authors may # in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree. # be found in the AUTHORS file in the root of the source tree.
#############################
# Build the non-neon library.
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
@ -52,54 +50,3 @@ LOCAL_C_INCLUDES := \
LOCAL_STATIC_LIBRARIES += libwebrtc_system_wrappers LOCAL_STATIC_LIBRARIES += libwebrtc_system_wrappers
include $(BUILD_STATIC_LIBRARY) 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)