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

Side by Side 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 unified diff | Download patch
OLDNEW
1 # Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 8
9 { 9 {
10 'targets': [ 10 'targets': [
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 }], 82 }],
83 ['target_arch=="arm" and arm_version>=7', { 83 ['target_arch=="arm" and arm_version>=7', {
84 'sources': [ 84 'sources': [
85 'fix/source/lattice_armv7.S', 85 'fix/source/lattice_armv7.S',
86 'fix/source/pitch_filter_armv6.S', 86 'fix/source/pitch_filter_armv6.S',
87 ], 87 ],
88 'sources!': [ 88 'sources!': [
89 'fix/source/lattice_c.c', 89 'fix/source/lattice_c.c',
90 'fix/source/pitch_filter_c.c', 90 'fix/source/pitch_filter_c.c',
91 ], 91 ],
92 'conditions': [
93 ['arm_neon==1 or arm_neon_optional==1', {
94 'dependencies': [ 'isac_neon' ],
95 }],
96 ],
97 }], 92 }],
98 ['target_arch=="arm64"', { 93 ['build_with_neon==1', {
99 'dependencies': ['isac_neon', ], 94 'dependencies': ['isac_neon', ],
100 }], 95 }],
101 ['target_arch=="mipsel" and mips_arch_variant!="r6"', { 96 ['target_arch=="mipsel" and mips_arch_variant!="r6"', {
102 'sources': [ 97 'sources': [
103 'fix/source/entropy_coding_mips.c', 98 'fix/source/entropy_coding_mips.c',
104 'fix/source/filters_mips.c', 99 'fix/source/filters_mips.c',
105 'fix/source/lattice_mips.c', 100 'fix/source/lattice_mips.c',
106 'fix/source/pitch_estimator_mips.c', 101 'fix/source/pitch_estimator_mips.c',
107 'fix/source/transform_mips.c', 102 'fix/source/transform_mips.c',
108 ], 103 ],
(...skipping 15 matching lines...) Expand all
124 'sources!': [ 119 'sources!': [
125 'fix/source/pitch_filter_c.c', 120 'fix/source/pitch_filter_c.c',
126 ], 121 ],
127 }], 122 }],
128 ], 123 ],
129 }], 124 }],
130 ], 125 ],
131 }, 126 },
132 ], 127 ],
133 'conditions': [ 128 'conditions': [
134 ['target_arch=="arm" and arm_version>=7 or target_arch=="arm64"', { 129 ['build_with_neon==1', {
135 'targets': [ 130 'targets': [
136 { 131 {
137 'target_name': 'isac_neon', 132 'target_name': 'isac_neon',
138 'type': 'static_library', 133 'type': 'static_library',
139 'includes': ['../../../../build/arm_neon.gypi',], 134 'includes': ['../../../../build/arm_neon.gypi',],
140 'dependencies': [ 135 'dependencies': [
141 '<(webrtc_root)/common_audio/common_audio.gyp:common_audio', 136 '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
142 ], 137 ],
143 'sources': [ 138 'sources': [
144 'fix/source/entropy_coding_neon.c', 139 'fix/source/entropy_coding_neon.c',
145 'fix/source/filters_neon.c', 140 'fix/source/filters_neon.c',
146 'fix/source/lattice_neon.c', 141 'fix/source/lattice_neon.c',
147 'fix/source/transform_neon.c', 142 'fix/source/transform_neon.c',
148 ], 143 ],
149 'conditions': [ 144 'conditions': [
150 # Disable LTO in isac_neon target due to compiler bug
151 ['use_lto==1', {
152 'cflags!': [
153 '-flto',
154 '-ffat-lto-objects',
155 ],
156 }],
157 # Disable AllpassFilter2FixDec16Neon function due to a clang 145 # Disable AllpassFilter2FixDec16Neon function due to a clang
158 # bug. Refer more details at: 146 # bug. Refer more details at:
159 # https://code.google.com/p/webrtc/issues/detail?id=4567 147 # https://code.google.com/p/webrtc/issues/detail?id=4567
160 ['target_arch!="arm64" or clang==0', { 148 ['target_arch!="arm64" or clang==0', {
161 'sources': ['fix/source/filterbanks_neon.c',], 149 'sources': ['fix/source/filterbanks_neon.c',],
162 }] 150 }]
163 ], 151 ],
164 }, 152 },
165 ], 153 ],
166 }], 154 }],
167 ], 155 ],
168 } 156 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698