Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(202)

Unified Diff: webrtc/modules/audio_coding/codecs/isac/isacfix.gypi

Issue 1181373004: Add a [rtc_]build_with_neon variable to unify conditions. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Use new variable and add arm_neon_config. Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/audio_coding/codecs/isac/isacfix.gypi
diff --git a/webrtc/modules/audio_coding/codecs/isac/isacfix.gypi b/webrtc/modules/audio_coding/codecs/isac/isacfix.gypi
index a85adbe43e08f7fe74549a6523e3a1b16cd0a20e..b536ea4678aef5080e743cf276220b074434f77d 100644
--- a/webrtc/modules/audio_coding/codecs/isac/isacfix.gypi
+++ b/webrtc/modules/audio_coding/codecs/isac/isacfix.gypi
@@ -89,13 +89,8 @@
'fix/source/lattice_c.c',
'fix/source/pitch_filter_c.c',
],
- 'conditions': [
- ['arm_neon==1 or arm_neon_optional==1', {
- 'dependencies': [ 'isac_neon' ],
- }],
- ],
}],
- ['target_arch=="arm64"', {
+ ['build_with_neon==1', {
'dependencies': ['isac_neon', ],
}],
['target_arch=="mipsel" and mips_arch_variant!="r6"', {
@@ -131,7 +126,7 @@
},
],
'conditions': [
- ['target_arch=="arm" and arm_version>=7 or target_arch=="arm64"', {
+ ['build_with_neon==1', {
'targets': [
{
'target_name': 'isac_neon',
@@ -147,18 +142,11 @@
'fix/source/transform_neon.c',
],
'conditions': [
- # Disable LTO in isac_neon target due to compiler bug
- ['use_lto==1', {
- 'cflags!': [
- '-flto',
- '-ffat-lto-objects',
- ],
- }],
# Disable AllpassFilter2FixDec16Neon function due to a clang
# bug. Refer more details at:
# https://code.google.com/p/webrtc/issues/detail?id=4567
['target_arch!="arm64" or clang==0', {
- 'sources': ['fix/source/filterbanks_neon.c',],
+ 'sources': ['fix/source/filterbanks_neon.c',],
}]
],
},

Powered by Google App Engine
This is Rietveld 408576698