From d66072b71b0b60bf010f500d990d937c418da25b Mon Sep 17 00:00:00 2001 From: mbonadei Date: Thu, 6 Jul 2017 07:44:14 -0700 Subject: [PATCH] Moving asm code out of common_audio_c sources list BUG=webrtc:7743 Review-Url: https://codereview.webrtc.org/2966173002 Cr-Commit-Position: refs/heads/master@{#18916} --- webrtc/common_audio/BUILD.gn | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/webrtc/common_audio/BUILD.gn b/webrtc/common_audio/BUILD.gn index 386a8311c5..ff0aa267fd 100644 --- a/webrtc/common_audio/BUILD.gn +++ b/webrtc/common_audio/BUILD.gn @@ -103,6 +103,23 @@ rtc_static_library("common_audio") { } } +rtc_source_set("common_audio_c_arm_asm") { + visibility = [ ":*" ] # Only targets in this file can depend on this. + sources = [] + if (current_cpu == "arm") { + sources += [ + "signal_processing/complex_bit_reverse_arm.S", + "signal_processing/spl_sqrt_floor_arm.S", + ] + + if (arm_version >= 7) { + sources += [ "signal_processing/filter_ar_fast_q12_armv7.S" ] + } else { + sources += [ "signal_processing/filter_ar_fast_q12.c" ] + } + } +} + rtc_source_set("common_audio_c") { visibility = [ ":*" ] # Only targets in this file can depend on this. sources = [ @@ -156,19 +173,6 @@ rtc_source_set("common_audio_c") { "vad/webrtc_vad.c", ] - if (current_cpu == "arm") { - sources += [ - "signal_processing/complex_bit_reverse_arm.S", - "signal_processing/spl_sqrt_floor_arm.S", - ] - - if (arm_version >= 7) { - sources += [ "signal_processing/filter_ar_fast_q12_armv7.S" ] - } else { - sources += [ "signal_processing/filter_ar_fast_q12.c" ] - } - } - if (current_cpu == "mipsel") { sources += [ "signal_processing/complex_bit_reverse_mips.c", @@ -202,6 +206,7 @@ rtc_source_set("common_audio_c") { public_configs = [ ":common_audio_config" ] deps = [ + ":common_audio_c_arm_asm", ":common_audio_cc", "..:webrtc_common", "../base:compile_assert_c",