Commit 22d06b0c authored by slan's avatar slan Committed by Commit bot

[Opus] Only include NEON sources and macros when arm_use_neon==true.

arm_neon.h throws an error when included in a non-neon build. Only
include neon-related sources when use_arm_neon is true.

BUG=657874

Review-Url: https://codereview.chromium.org/2427333004
Cr-Commit-Position: refs/heads/master@{#435027}
parent 153f6770
......@@ -371,12 +371,9 @@ static_library("opus") {
"src/celt/arm/arm_celt_map.c",
"src/celt/arm/armcpu.c",
"src/celt/arm/armcpu.h",
"src/celt/arm/celt_neon_intr.c",
"src/celt/arm/fft_arm.h",
"src/celt/arm/mdct_arm.h",
"src/celt/arm/pitch_arm.h",
"src/silk/arm/NSQ_neon.c",
"src/silk/arm/NSQ_neon.h",
"src/silk/arm/arm_silk_map.c",
]
......@@ -385,14 +382,25 @@ static_library("opus") {
defines += [
"OPUS_ARM_MAY_HAVE_EDSP",
"OPUS_ARM_MAY_HAVE_MEDIA",
"OPUS_ARM_MAY_HAVE_NEON",
"OPUS_ARM_MAY_HAVE_NEON_INTR",
"OPUS_HAVE_RTCD",
]
deps = [
":convert_rtcd_assembler",
]
if (arm_use_neon) {
sources += [
"src/celt/arm/celt_neon_intr.c",
"src/silk/arm/NSQ_neon.c",
"src/silk/arm/NSQ_neon.h",
]
defines += [
"OPUS_ARM_MAY_HAVE_NEON",
"OPUS_ARM_MAY_HAVE_NEON_INTR",
]
}
}
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment