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

Only build neon code for arm but not arm64.

Browse Source 
This fixed aosp_arm64 build.

Change-Id: Ic4840c57a7d2b68c199c725c35d61f85adfee9e7
This commit is contained in:
Ying Wang
2014-03-10 18:16:38 -07:00
parent 381d47ca53
commit 9fb5517a05
4 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Android.mk
View File

@ -29,7 +29,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
# Add Neon libraries. # Add Neon libraries.
ifeq ($(WEBRTC_BUILD_NEON_LIBS),true) ifeq ($(WEBRTC_BUILD_NEON_LIBS),true)
LOCAL_WHOLE_STATIC_LIBRARIES += \ LOCAL_WHOLE_STATIC_LIBRARIES_arm += \
libwebrtc_aecm_neon \ libwebrtc_aecm_neon \
libwebrtc_ns_neon libwebrtc_ns_neon
endif endif
@ -63,7 +63,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
libwebrtc_spl \ libwebrtc_spl \
libwebrtc_system_wrappers libwebrtc_system_wrappers
ifeq ($(WEBRTC_BUILD_NEON_LIBS),true) ifeq ($(WEBRTC_BUILD_NEON_LIBS),true)
LOCAL_WHOLE_STATIC_LIBRARIES += \ LOCAL_WHOLE_STATIC_LIBRARIES_arm += \
libwebrtc_isacfix_neon libwebrtc_isacfix_neon
endif endif
@ -95,7 +95,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
libwebrtc_spl_gnustl_static \ libwebrtc_spl_gnustl_static \
libwebrtc_system_wrappers_gnustl_static libwebrtc_system_wrappers_gnustl_static
ifeq ($(WEBRTC_BUILD_NEON_LIBS),true) ifeq ($(WEBRTC_BUILD_NEON_LIBS),true)
LOCAL_WHOLE_STATIC_LIBRARIES += \ LOCAL_WHOLE_STATIC_LIBRARIES_arm += \
libwebrtc_isacfix_neon_gnustl_static libwebrtc_isacfix_neon_gnustl_static
endif endif

11
src/modules/audio_coding/codecs/isac/fix/source/Android.mk
View File

@ -118,12 +118,8 @@ LOCAL_CFLAGS := \
-mfloat-abi=softfp \ -mfloat-abi=softfp \
-flax-vector-conversions -flax-vector-conversions
LOCAL_MODULE_TARGET_ARCH := arm
LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm)
LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86)
LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips)
LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64)
LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64)
LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64)
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../interface \ $(LOCAL_PATH)/../interface \
@ -181,7 +177,10 @@ LOCAL_STATIC_LIBRARIES := \
libwebrtc_system_wrappers$(MY_LIB_SUFFIX) libwebrtc_system_wrappers$(MY_LIB_SUFFIX)
ifeq ($(WEBRTC_BUILD_NEON_LIBS),true) ifeq ($(WEBRTC_BUILD_NEON_LIBS),true)
LOCAL_STATIC_LIBRARIES += \ # We need to dup libwebrtc_isacfix$(MY_LIB_SUFFIX) because ibwebrtc_isacfix_neon$(MY_LIB_SUFFIX)
# has dependency on it.
LOCAL_STATIC_LIBRARIES_arm += \
libwebrtc_isacfix$(MY_LIB_SUFFIX) \
libwebrtc_isacfix_neon$(MY_LIB_SUFFIX) libwebrtc_isacfix_neon$(MY_LIB_SUFFIX)
endif endif

6
src/modules/audio_processing/aecm/Android.mk
View File

@ -81,12 +81,8 @@ LOCAL_CFLAGS := \
-mfloat-abi=softfp \ -mfloat-abi=softfp \
-flax-vector-conversions -flax-vector-conversions
LOCAL_MODULE_TARGET_ARCH := arm
LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm)
LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86)
LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips)
LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64)
LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64)
LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64)
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/interface \ $(LOCAL_PATH)/interface \

6
src/modules/audio_processing/ns/Android.mk
View File

@ -83,12 +83,8 @@ LOCAL_CFLAGS := \
-mfloat-abi=softfp \ -mfloat-abi=softfp \
-flax-vector-conversions -flax-vector-conversions
LOCAL_MODULE_TARGET_ARCH := arm
LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm) LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm)
LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86)
LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips)
LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64)
LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64)
LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64)
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/interface \ $(LOCAL_PATH)/interface \