Commit | Line | Data |
---|---|---|
0826c9bd JB |
1 | --- chromium-30.0.1599.114/third_party/webrtc/common_audio/common_audio.gyp.orig 2013-11-07 09:49:02.000000000 +0100 |
2 | +++ chromium-30.0.1599.114/third_party/webrtc/common_audio/common_audio.gyp 2013-11-07 09:50:26.000000000 +0100 | |
3 | @@ -103,7 +103,7 @@ | |
4 | 'signal_processing/spl_sqrt_floor.c', | |
5 | ], | |
6 | 'conditions': [ | |
7 | - ['armv7==1', { | |
8 | + ['armv7==1 and arm_neon==1', { | |
9 | 'dependencies': ['common_audio_neon',], | |
10 | 'sources': [ | |
11 | 'signal_processing/filter_ar_fast_q12_armv7.S', | |
12 | @@ -150,7 +150,7 @@ | |
13 | }, | |
14 | ], # targets | |
15 | }], | |
16 | - ['target_arch=="arm" and armv7==1', { | |
17 | + ['target_arch=="arm" and armv7==1 and arm_neon==1', { | |
18 | 'targets': [ | |
19 | { | |
20 | 'target_name': 'common_audio_neon', | |
21 | --- chromium-30.0.1599.114/third_party/webrtc/modules/audio_processing/audio_processing.gypi.orig 2013-11-07 09:49:14.000000000 +0100 | |
22 | +++ chromium-30.0.1599.114/third_party/webrtc/modules/audio_processing/audio_processing.gypi 2013-11-07 09:59:02.000000000 +0100 | |
23 | @@ -119,7 +119,7 @@ | |
24 | ['target_arch=="ia32" or target_arch=="x64"', { | |
25 | 'dependencies': ['audio_processing_sse2',], | |
26 | }], | |
27 | - ['target_arch=="arm" and armv7==1', { | |
28 | + ['target_arch=="arm" and armv7==1 and arm_neon==1', { | |
29 | 'dependencies': ['audio_processing_neon',], | |
30 | }], | |
31 | ], | |
32 | @@ -161,7 +161,7 @@ | |
33 | }, | |
34 | ], | |
35 | }], | |
36 | - ['target_arch=="arm" and armv7==1', { | |
37 | + ['target_arch=="arm" and armv7==1 and arm_neon==1', { | |
38 | 'targets': [{ | |
39 | 'target_name': 'audio_processing_neon', | |
40 | 'type': 'static_library', | |
41 | --- chromium-30.0.1599.114/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi.orig 2013-11-07 09:49:27.000000000 +0100 | |
42 | +++ chromium-30.0.1599.114/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi 2013-11-07 10:00:06.000000000 +0100 | |
43 | @@ -72,7 +72,7 @@ | |
44 | 'WEBRTC_LINUX', | |
45 | ], | |
46 | }], | |
47 | - ['target_arch=="arm" and armv7==1', { | |
48 | + ['target_arch=="arm" and armv7==1 and arm_neon==1', { | |
49 | 'dependencies': [ 'isac_neon', ], | |
50 | 'sources': [ | |
51 | 'lattice_armv7.S', | |
52 | @@ -87,7 +87,7 @@ | |
53 | }, | |
54 | ], | |
55 | 'conditions': [ | |
56 | - ['target_arch=="arm" and armv7==1', { | |
57 | + ['target_arch=="arm" and armv7==1 and arm_neon==1', { | |
58 | 'targets': [ | |
59 | { | |
60 | 'target_name': 'isac_neon', |