Remove WEBRTC_BUILD_NEON_LIBS
It doesn't work, and only complicates the Soong conversion (since it can't even be tested). It shouldn't be that hard to reimplement in Soong if we ever fix it. Test: mmma external/webrtc Change-Id: Ia5a23a6b7fb1ee17f7d9633016eb8ff73435b448
This commit is contained in:
@ -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)
|
||||
|
@ -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
|
||||
|
||||
|
Reference in New Issue
Block a user