admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing cross-compiling issues on android arm

Browse Source 
BUG=webrtc:7042

Review-Url: https://codereview.webrtc.org/2647293006
Cr-Commit-Position: refs/heads/master@{#16265}
This commit is contained in:
mbonadei 2017-01-25 05:34:46 -08:00 committed by Commit bot
parent c07cc56a2e
commit e5dc3cefab
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
webrtc/modules/audio_coding/BUILD.gn
View File

@ -708,6 +708,10 @@ rtc_source_set("isac_fix_c") {
"../../system_wrappers",
]
if (rtc_build_with_neon) {
deps += [ ":isac_neon" ]
}
if (current_cpu == "arm" && arm_version >= 7) {
sources += [
"codecs/isac/fix/source/lattice_armv7.S",
@ -746,6 +750,10 @@ rtc_source_set("isac_fix_c") {
if (rtc_build_with_neon) {
rtc_static_library("isac_neon") {
# TODO(mbonadei): Remove (bugs.webrtc.org/6828)
# Errors on cyclic dependency with :isac_fix_c if enabled.
check_includes = false
sources = [
"codecs/isac/fix/source/entropy_coding_neon.c",
"codecs/isac/fix/source/filterbanks_neon.c",
@ -772,7 +780,6 @@ if (rtc_build_with_neon) {
}
deps = [
":isac_fix_c",
"../../base:rtc_base_approved",
"../../common_audio",
]

9
webrtc/modules/audio_processing/BUILD.gn
View File

@ -284,6 +284,10 @@ rtc_source_set("audio_processing_c") {
"../../common_audio",
"../../system_wrappers",
]
if (rtc_build_with_neon) {
deps += [ ":audio_processing_neon_c" ]
}
}
if (rtc_enable_protobuf) {
@ -365,6 +369,10 @@ if (rtc_build_with_neon) {
}
rtc_static_library("audio_processing_neon_c") {
# TODO(mbonadei): Remove (bugs.webrtc.org/6828)
# Errors on cyclic dependency with :audio_processing_c if enabled.
check_includes = false
sources = [
"ns/nsx_core_neon.c",
]
@ -386,7 +394,6 @@ if (rtc_build_with_neon) {
]
}
deps = [
":audio_processing_c",
"../../base:rtc_base_approved",
]
}