~mozillateam/firefox/firefox-beta.bionic

« back to all changes in this revision

Viewing changes to debian/patches/update-gn-mozbuild.patch

  • Committer: Rico Tzschichholz
  • Date: 2018-05-25 06:32:40 UTC
  • Revision ID: ricotz@ubuntu.com-20180525063240-drlotmqy2ka0l23t
* Fix the webrtc build on armhf and arm64 by providing build configs rather
  than just disabling it
  - add debian/patches/extra-webrtc-build-configs.patch
  - add debian/patches/update-gn-mozbuild.patch
  - update debian/patches/series
  - update debian/config/mozconfig.in
* Fix multiple definitions of WebRtc_GetCPUFeaturesARM by excluding
  cpu_features_linux.cc, as was the case previously
  - add debian/patches/fix-armhf-webrtc-build.patch
  - update debian/patches/update-gn-mozbuild.patch
  - update debian/patches/series

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
--- a/media/webrtc/trunk/moz.build
 
2
+++ b/media/webrtc/trunk/moz.build
 
3
@@ -84,7 +84,7 @@
 
4
     "/media/webrtc/trunk/webrtc/webrtc_gn"
 
5
 ]
 
6
 
 
7
-if CONFIG["OS_TARGET"] == "WINNT":
 
8
+if CONFIG["OS_TARGET"] == "DragonFly":
 
9
 
 
10
     DIRS += [
 
11
         "/media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn",
 
12
@@ -96,7 +96,7 @@
 
13
         "/media/webrtc/trunk/webrtc/video_engine/video_engine_gn"
 
14
     ]
 
15
 
 
16
-if CONFIG["OS_TARGET"] == "DragonFly":
 
17
+if CONFIG["OS_TARGET"] == "WINNT":
 
18
 
 
19
     DIRS += [
 
20
         "/media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn",
 
21
@@ -143,13 +143,8 @@
 
22
 if CONFIG["OS_TARGET"] == "Linux":
 
23
 
 
24
     DIRS += [
 
25
-        "/media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn",
 
26
-        "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn",
 
27
-        "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
 
28
         "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_gn",
 
29
         "/media/webrtc/trunk/webrtc/modules/desktop_capture/primitives_gn",
 
30
-        "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn",
 
31
-        "/media/webrtc/trunk/webrtc/system_wrappers/cpu_features_linux_gn",
 
32
         "/media/webrtc/trunk/webrtc/video_engine/video_engine_gn"
 
33
     ]
 
34
 
 
35
@@ -174,6 +169,17 @@
 
36
         "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn"
 
37
     ]
 
38
 
 
39
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
 
40
+
 
41
+    DIRS += [
 
42
+        "/media/webrtc/trunk/webrtc/common_audio/common_audio_neon_c_gn",
 
43
+        "/media/webrtc/trunk/webrtc/common_audio/common_audio_neon_gn",
 
44
+        "/media/webrtc/trunk/webrtc/modules/audio_coding/isac_neon_gn",
 
45
+        "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_c_gn",
 
46
+        "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_gn",
 
47
+        "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_neon_gn"
 
48
+    ]
 
49
+
 
50
 if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "FreeBSD":
 
51
 
 
52
     DIRS += [
 
53
@@ -185,6 +191,26 @@
 
54
         "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_neon_gn"
 
55
     ]
 
56
 
 
57
+if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
 
58
+
 
59
+    DIRS += [
 
60
+        "/media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn",
 
61
+        "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn",
 
62
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
 
63
+        "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn"
 
64
+    ]
 
65
+
 
66
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
 
67
+
 
68
+    DIRS += [
 
69
+        "/media/webrtc/trunk/webrtc/common_audio/common_audio_neon_c_gn",
 
70
+        "/media/webrtc/trunk/webrtc/common_audio/common_audio_neon_gn",
 
71
+        "/media/webrtc/trunk/webrtc/modules/audio_coding/isac_neon_gn",
 
72
+        "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_c_gn",
 
73
+        "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_gn",
 
74
+        "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_neon_gn"
 
75
+    ]
 
76
+
 
77
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
 
78
 
 
79
     DIRS += [
 
80
@@ -215,6 +241,15 @@
 
81
         "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_neon_gn"
 
82
     ]
 
83
 
 
84
+if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
 
85
+
 
86
+    DIRS += [
 
87
+        "/media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn",
 
88
+        "/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn",
 
89
+        "/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
 
90
+        "/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn"
 
91
+    ]
 
92
+
 
93
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "FreeBSD":
 
94
 
 
95
     DIRS += [
 
96
--- a/media/webrtc/trunk/webrtc/api/audio_mixer_api_gn/moz.build
 
97
+++ b/media/webrtc/trunk/webrtc/api/audio_mixer_api_gn/moz.build
 
98
@@ -169,6 +169,19 @@
 
99
     DEFINES["WEBRTC_ARCH_ARM64"] = True
 
100
     DEFINES["WEBRTC_HAS_NEON"] = True
 
101
 
 
102
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
103
+
 
104
+    DEFINES["DISABLE_NACL"] = True
 
105
+    DEFINES["NO_TCMALLOC"] = True
 
106
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
107
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
108
+
 
109
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
110
+
 
111
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
112
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
113
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
114
+
 
115
 if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
 
116
 
 
117
     DEFINES["WEBRTC_ARCH_ARM64"] = True
 
118
--- a/media/webrtc/trunk/webrtc/api/call_api_gn/moz.build
 
119
+++ b/media/webrtc/trunk/webrtc/api/call_api_gn/moz.build
 
120
@@ -169,6 +169,19 @@
 
121
     DEFINES["WEBRTC_ARCH_ARM64"] = True
 
122
     DEFINES["WEBRTC_HAS_NEON"] = True
 
123
 
 
124
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
125
+
 
126
+    DEFINES["DISABLE_NACL"] = True
 
127
+    DEFINES["NO_TCMALLOC"] = True
 
128
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
129
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
130
+
 
131
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
132
+
 
133
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
134
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
135
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
136
+
 
137
 if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
 
138
 
 
139
     DEFINES["WEBRTC_ARCH_ARM64"] = True
 
140
--- a/media/webrtc/trunk/webrtc/api/transport_api_gn/moz.build
 
141
+++ b/media/webrtc/trunk/webrtc/api/transport_api_gn/moz.build
 
142
@@ -165,6 +165,19 @@
 
143
     DEFINES["WEBRTC_ARCH_ARM64"] = True
 
144
     DEFINES["WEBRTC_HAS_NEON"] = True
 
145
 
 
146
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
147
+
 
148
+    DEFINES["DISABLE_NACL"] = True
 
149
+    DEFINES["NO_TCMALLOC"] = True
 
150
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
151
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
152
+
 
153
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
154
+
 
155
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
156
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
157
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
158
+
 
159
 if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
 
160
 
 
161
     DEFINES["WEBRTC_ARCH_ARM64"] = True
 
162
--- a/media/webrtc/trunk/webrtc/api/video_frame_api_gn/moz.build
 
163
+++ b/media/webrtc/trunk/webrtc/api/video_frame_api_gn/moz.build
 
164
@@ -199,6 +199,23 @@
 
165
         "-msse2"
 
166
     ]
 
167
 
 
168
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
169
+
 
170
+    DEFINES["DISABLE_NACL"] = True
 
171
+    DEFINES["NO_TCMALLOC"] = True
 
172
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
173
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
174
+
 
175
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
176
+
 
177
+    CXXFLAGS += [
 
178
+        "-mfpu=neon"
 
179
+    ]
 
180
+
 
181
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
182
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
183
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
184
+
 
185
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
186
 
 
187
     CXXFLAGS += [
 
188
--- a/media/webrtc/trunk/webrtc/audio/audio_gn/moz.build
 
189
+++ b/media/webrtc/trunk/webrtc/audio/audio_gn/moz.build
 
190
@@ -219,6 +219,23 @@
 
191
         "-msse2"
 
192
     ]
 
193
 
 
194
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
195
+
 
196
+    DEFINES["DISABLE_NACL"] = True
 
197
+    DEFINES["NO_TCMALLOC"] = True
 
198
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
199
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
200
+
 
201
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
202
+
 
203
+    CXXFLAGS += [
 
204
+        "-mfpu=neon"
 
205
+    ]
 
206
+
 
207
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
208
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
209
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
210
+
 
211
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
212
 
 
213
     CXXFLAGS += [
 
214
--- a/media/webrtc/trunk/webrtc/audio/utility/audio_frame_operations_gn/moz.build
 
215
+++ b/media/webrtc/trunk/webrtc/audio/utility/audio_frame_operations_gn/moz.build
 
216
@@ -189,6 +189,23 @@
 
217
         "-msse2"
 
218
     ]
 
219
 
 
220
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
221
+
 
222
+    DEFINES["DISABLE_NACL"] = True
 
223
+    DEFINES["NO_TCMALLOC"] = True
 
224
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
225
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
226
+
 
227
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
228
+
 
229
+    CXXFLAGS += [
 
230
+        "-mfpu=neon"
 
231
+    ]
 
232
+
 
233
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
234
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
235
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
236
+
 
237
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
238
 
 
239
     CXXFLAGS += [
 
240
--- a/media/webrtc/trunk/webrtc/base/gtest_prod_gn/moz.build
 
241
+++ b/media/webrtc/trunk/webrtc/base/gtest_prod_gn/moz.build
 
242
@@ -165,6 +165,19 @@
 
243
     DEFINES["WEBRTC_ARCH_ARM64"] = True
 
244
     DEFINES["WEBRTC_HAS_NEON"] = True
 
245
 
 
246
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
247
+
 
248
+    DEFINES["DISABLE_NACL"] = True
 
249
+    DEFINES["NO_TCMALLOC"] = True
 
250
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
251
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
252
+
 
253
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
254
+
 
255
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
256
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
257
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
258
+
 
259
 if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
 
260
 
 
261
     DEFINES["WEBRTC_ARCH_ARM64"] = True
 
262
--- a/media/webrtc/trunk/webrtc/base/rtc_base_approved_gn/moz.build
 
263
+++ b/media/webrtc/trunk/webrtc/base/rtc_base_approved_gn/moz.build
 
264
@@ -252,6 +252,23 @@
 
265
         "-msse2"
 
266
     ]
 
267
 
 
268
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
269
+
 
270
+    DEFINES["DISABLE_NACL"] = True
 
271
+    DEFINES["NO_TCMALLOC"] = True
 
272
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
273
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
274
+
 
275
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
276
+
 
277
+    CXXFLAGS += [
 
278
+        "-mfpu=neon"
 
279
+    ]
 
280
+
 
281
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
282
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
283
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
284
+
 
285
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
286
 
 
287
     CXXFLAGS += [
 
288
--- a/media/webrtc/trunk/webrtc/base/rtc_numerics_gn/moz.build
 
289
+++ b/media/webrtc/trunk/webrtc/base/rtc_numerics_gn/moz.build
 
290
@@ -189,6 +189,23 @@
 
291
         "-msse2"
 
292
     ]
 
293
 
 
294
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
295
+
 
296
+    DEFINES["DISABLE_NACL"] = True
 
297
+    DEFINES["NO_TCMALLOC"] = True
 
298
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
299
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
300
+
 
301
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
302
+
 
303
+    CXXFLAGS += [
 
304
+        "-mfpu=neon"
 
305
+    ]
 
306
+
 
307
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
308
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
309
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
310
+
 
311
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
312
 
 
313
     CXXFLAGS += [
 
314
--- a/media/webrtc/trunk/webrtc/base/rtc_task_queue_gn/moz.build
 
315
+++ b/media/webrtc/trunk/webrtc/base/rtc_task_queue_gn/moz.build
 
316
@@ -265,6 +265,23 @@
 
317
         "-msse2"
 
318
     ]
 
319
 
 
320
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
321
+
 
322
+    DEFINES["DISABLE_NACL"] = True
 
323
+    DEFINES["NO_TCMALLOC"] = True
 
324
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
325
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
326
+
 
327
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
328
+
 
329
+    CXXFLAGS += [
 
330
+        "-mfpu=neon"
 
331
+    ]
 
332
+
 
333
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
334
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
335
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
336
+
 
337
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
338
 
 
339
     CXXFLAGS += [
 
340
--- a/media/webrtc/trunk/webrtc/call/call_gn/moz.build
 
341
+++ b/media/webrtc/trunk/webrtc/call/call_gn/moz.build
 
342
@@ -210,6 +210,23 @@
 
343
         "-msse2"
 
344
     ]
 
345
 
 
346
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
347
+
 
348
+    DEFINES["DISABLE_NACL"] = True
 
349
+    DEFINES["NO_TCMALLOC"] = True
 
350
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
351
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
352
+
 
353
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
354
+
 
355
+    CXXFLAGS += [
 
356
+        "-mfpu=neon"
 
357
+    ]
 
358
+
 
359
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
360
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
361
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
362
+
 
363
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
364
 
 
365
     CXXFLAGS += [
 
366
--- a/media/webrtc/trunk/webrtc/call/call_interfaces_gn/moz.build
 
367
+++ b/media/webrtc/trunk/webrtc/call/call_interfaces_gn/moz.build
 
368
@@ -185,6 +185,23 @@
 
369
         "-msse2"
 
370
     ]
 
371
 
 
372
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
373
+
 
374
+    DEFINES["DISABLE_NACL"] = True
 
375
+    DEFINES["NO_TCMALLOC"] = True
 
376
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
377
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
378
+
 
379
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
380
+
 
381
+    CXXFLAGS += [
 
382
+        "-mfpu=neon"
 
383
+    ]
 
384
+
 
385
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
386
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
387
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
388
+
 
389
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
390
 
 
391
     CXXFLAGS += [
 
392
--- a/media/webrtc/trunk/webrtc/common_audio/common_audio_c_gn/moz.build
 
393
+++ b/media/webrtc/trunk/webrtc/common_audio/common_audio_c_gn/moz.build
 
394
@@ -147,12 +147,6 @@
 
395
     DEFINES["WEBRTC_POSIX"] = True
 
396
     DEFINES["_FILE_OFFSET_BITS"] = "64"
 
397
 
 
398
-    UNIFIED_SOURCES += [
 
399
-        "/media/webrtc/trunk/webrtc/common_audio/signal_processing/complex_bit_reverse.c",
 
400
-        "/media/webrtc/trunk/webrtc/common_audio/signal_processing/filter_ar_fast_q12.c",
 
401
-        "/media/webrtc/trunk/webrtc/common_audio/signal_processing/spl_sqrt_floor.c"
 
402
-    ]
 
403
-
 
404
 if CONFIG["OS_TARGET"] == "NetBSD":
 
405
 
 
406
     DEFINES["USE_X11"] = "1"
 
407
@@ -234,6 +228,14 @@
 
408
 
 
409
     DEFINES["_FORTIFY_SOURCE"] = "2"
 
410
 
 
411
+if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
 
412
+
 
413
+    UNIFIED_SOURCES += [
 
414
+        "/media/webrtc/trunk/webrtc/common_audio/signal_processing/complex_bit_reverse.c",
 
415
+        "/media/webrtc/trunk/webrtc/common_audio/signal_processing/filter_ar_fast_q12.c",
 
416
+        "/media/webrtc/trunk/webrtc/common_audio/signal_processing/spl_sqrt_floor.c"
 
417
+    ]
 
418
+
 
419
 if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
 
420
 
 
421
     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 
422
@@ -288,6 +290,51 @@
 
423
         "-msse2"
 
424
     ]
 
425
 
 
426
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
427
+
 
428
+    DEFINES["DISABLE_NACL"] = True
 
429
+    DEFINES["NO_TCMALLOC"] = True
 
430
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
431
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
432
+
 
433
+    UNIFIED_SOURCES += [
 
434
+        "/media/webrtc/trunk/webrtc/common_audio/signal_processing/complex_bit_reverse.c",
 
435
+        "/media/webrtc/trunk/webrtc/common_audio/signal_processing/filter_ar_fast_q12.c",
 
436
+        "/media/webrtc/trunk/webrtc/common_audio/signal_processing/spl_sqrt_floor.c"
 
437
+    ]
 
438
+
 
439
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
440
+
 
441
+    CFLAGS += [
 
442
+        "-mfpu=neon"
 
443
+    ]
 
444
+
 
445
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
446
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
447
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
448
+
 
449
+    SOURCES += [
 
450
+        "/media/webrtc/trunk/webrtc/common_audio/signal_processing/complex_bit_reverse_arm.S",
 
451
+        "/media/webrtc/trunk/webrtc/common_audio/signal_processing/filter_ar_fast_q12_armv7.S",
 
452
+        "/media/webrtc/trunk/webrtc/common_audio/signal_processing/spl_sqrt_floor_arm.S"
 
453
+    ]
 
454
+
 
455
+if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
456
+
 
457
+    UNIFIED_SOURCES += [
 
458
+        "/media/webrtc/trunk/webrtc/common_audio/signal_processing/complex_bit_reverse.c",
 
459
+        "/media/webrtc/trunk/webrtc/common_audio/signal_processing/filter_ar_fast_q12.c",
 
460
+        "/media/webrtc/trunk/webrtc/common_audio/signal_processing/spl_sqrt_floor.c"
 
461
+    ]
 
462
+
 
463
+if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
464
+
 
465
+    UNIFIED_SOURCES += [
 
466
+        "/media/webrtc/trunk/webrtc/common_audio/signal_processing/complex_bit_reverse.c",
 
467
+        "/media/webrtc/trunk/webrtc/common_audio/signal_processing/filter_ar_fast_q12.c",
 
468
+        "/media/webrtc/trunk/webrtc/common_audio/signal_processing/spl_sqrt_floor.c"
 
469
+    ]
 
470
+
 
471
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
472
 
 
473
     CFLAGS += [
 
474
--- a/media/webrtc/trunk/webrtc/common_audio/common_audio_gn/moz.build
 
475
+++ b/media/webrtc/trunk/webrtc/common_audio/common_audio_gn/moz.build
 
476
@@ -218,6 +218,23 @@
 
477
         "-msse2"
 
478
     ]
 
479
 
 
480
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
481
+
 
482
+    DEFINES["DISABLE_NACL"] = True
 
483
+    DEFINES["NO_TCMALLOC"] = True
 
484
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
485
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
486
+
 
487
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
488
+
 
489
+    CXXFLAGS += [
 
490
+        "-mfpu=neon"
 
491
+    ]
 
492
+
 
493
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
494
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
495
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
496
+
 
497
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
498
 
 
499
     CXXFLAGS += [
 
500
--- a/media/webrtc/trunk/webrtc/common_audio/common_audio_neon_c_gn/moz.build
 
501
+++ b/media/webrtc/trunk/webrtc/common_audio/common_audio_neon_c_gn/moz.build
 
502
@@ -40,7 +40,6 @@
 
503
     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
 
504
     DEFINES["NDEBUG"] = True
 
505
     DEFINES["NVALGRIND"] = True
 
506
-    DEFINES["_FORTIFY_SOURCE"] = "2"
 
507
 
 
508
 if CONFIG["MOZ_DEBUG"] == "1":
 
509
 
 
510
@@ -66,6 +65,20 @@
 
511
     DEFINES["WEBRTC_ARCH_ARM64"] = True
 
512
     DEFINES["WEBRTC_BSD"] = True
 
513
 
 
514
+if CONFIG["OS_TARGET"] == "Linux":
 
515
+
 
516
+    DEFINES["USE_NSS_CERTS"] = "1"
 
517
+    DEFINES["USE_X11"] = "1"
 
518
+    DEFINES["WEBRTC_LINUX"] = True
 
519
+
 
520
+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
 
521
+
 
522
+    DEFINES["_FORTIFY_SOURCE"] = "2"
 
523
+
 
524
+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
 
525
+
 
526
+    DEFINES["_FORTIFY_SOURCE"] = "2"
 
527
+
 
528
 if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
 
529
 
 
530
     DEFINES["WEBRTC_ARCH_ARM64"] = True
 
531
@@ -74,6 +87,21 @@
 
532
 
 
533
     CFLAGS += [
 
534
         "-mfpu=neon"
 
535
+    ]
 
536
+
 
537
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
538
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
539
+
 
540
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
541
+
 
542
+    DEFINES["DISABLE_NACL"] = True
 
543
+    DEFINES["NO_TCMALLOC"] = True
 
544
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
545
+
 
546
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
547
+
 
548
+    CFLAGS += [
 
549
+        "-mfpu=neon"
 
550
     ]
 
551
 
 
552
     DEFINES["WEBRTC_ARCH_ARM"] = True
 
553
--- a/media/webrtc/trunk/webrtc/common_audio/common_audio_neon_gn/moz.build
 
554
+++ b/media/webrtc/trunk/webrtc/common_audio/common_audio_neon_gn/moz.build
 
555
@@ -39,7 +39,6 @@
 
556
     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
 
557
     DEFINES["NDEBUG"] = True
 
558
     DEFINES["NVALGRIND"] = True
 
559
-    DEFINES["_FORTIFY_SOURCE"] = "2"
 
560
 
 
561
 if CONFIG["MOZ_DEBUG"] == "1":
 
562
 
 
563
@@ -65,6 +64,20 @@
 
564
     DEFINES["WEBRTC_ARCH_ARM64"] = True
 
565
     DEFINES["WEBRTC_BSD"] = True
 
566
 
 
567
+if CONFIG["OS_TARGET"] == "Linux":
 
568
+
 
569
+    DEFINES["USE_NSS_CERTS"] = "1"
 
570
+    DEFINES["USE_X11"] = "1"
 
571
+    DEFINES["WEBRTC_LINUX"] = True
 
572
+
 
573
+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
 
574
+
 
575
+    DEFINES["_FORTIFY_SOURCE"] = "2"
 
576
+
 
577
+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
 
578
+
 
579
+    DEFINES["_FORTIFY_SOURCE"] = "2"
 
580
+
 
581
 if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
 
582
 
 
583
     DEFINES["WEBRTC_ARCH_ARM64"] = True
 
584
@@ -73,6 +86,21 @@
 
585
 
 
586
     CXXFLAGS += [
 
587
         "-mfpu=neon"
 
588
+    ]
 
589
+
 
590
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
591
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
592
+
 
593
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
594
+
 
595
+    DEFINES["DISABLE_NACL"] = True
 
596
+    DEFINES["NO_TCMALLOC"] = True
 
597
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
598
+
 
599
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
600
+
 
601
+    CXXFLAGS += [
 
602
+        "-mfpu=neon"
 
603
     ]
 
604
 
 
605
     DEFINES["WEBRTC_ARCH_ARM"] = True
 
606
--- a/media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn/moz.build
 
607
+++ b/media/webrtc/trunk/webrtc/common_audio/common_audio_sse2_gn/moz.build
 
608
@@ -111,6 +111,7 @@
 
609
 if CONFIG["OS_TARGET"] == "NetBSD":
 
610
 
 
611
     CXXFLAGS += [
 
612
+        "-msse2",
 
613
         "-msse2"
 
614
     ]
 
615
 
 
616
@@ -122,6 +123,7 @@
 
617
 if CONFIG["OS_TARGET"] == "OpenBSD":
 
618
 
 
619
     CXXFLAGS += [
 
620
+        "-msse2",
 
621
         "-msse2"
 
622
     ]
 
623
 
 
624
--- a/media/webrtc/trunk/webrtc/common_video/common_video_gn/moz.build
 
625
+++ b/media/webrtc/trunk/webrtc/common_video/common_video_gn/moz.build
 
626
@@ -226,6 +226,23 @@
 
627
         "-msse2"
 
628
     ]
 
629
 
 
630
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
631
+
 
632
+    DEFINES["DISABLE_NACL"] = True
 
633
+    DEFINES["NO_TCMALLOC"] = True
 
634
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
635
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
636
+
 
637
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
638
+
 
639
+    CXXFLAGS += [
 
640
+        "-mfpu=neon"
 
641
+    ]
 
642
+
 
643
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
644
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
645
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
646
+
 
647
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
648
 
 
649
     CXXFLAGS += [
 
650
--- a/media/webrtc/trunk/webrtc/logging/rtc_event_log_api_gn/moz.build
 
651
+++ b/media/webrtc/trunk/webrtc/logging/rtc_event_log_api_gn/moz.build
 
652
@@ -165,6 +165,19 @@
 
653
     DEFINES["WEBRTC_ARCH_ARM64"] = True
 
654
     DEFINES["WEBRTC_HAS_NEON"] = True
 
655
 
 
656
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
657
+
 
658
+    DEFINES["DISABLE_NACL"] = True
 
659
+    DEFINES["NO_TCMALLOC"] = True
 
660
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
661
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
662
+
 
663
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
664
+
 
665
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
666
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
667
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
668
+
 
669
 if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
 
670
 
 
671
     DEFINES["WEBRTC_ARCH_ARM64"] = True
 
672
--- a/media/webrtc/trunk/webrtc/logging/rtc_event_log_impl_gn/moz.build
 
673
+++ b/media/webrtc/trunk/webrtc/logging/rtc_event_log_impl_gn/moz.build
 
674
@@ -208,6 +208,23 @@
 
675
         "-msse2"
 
676
     ]
 
677
 
 
678
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
679
+
 
680
+    DEFINES["DISABLE_NACL"] = True
 
681
+    DEFINES["NO_TCMALLOC"] = True
 
682
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
683
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
684
+
 
685
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
686
+
 
687
+    CXXFLAGS += [
 
688
+        "-mfpu=neon"
 
689
+    ]
 
690
+
 
691
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
692
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
693
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
694
+
 
695
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
696
 
 
697
     CXXFLAGS += [
 
698
--- a/media/webrtc/trunk/webrtc/media/mozilla_rtc_media_gn/moz.build
 
699
+++ b/media/webrtc/trunk/webrtc/media/mozilla_rtc_media_gn/moz.build
 
700
@@ -187,6 +187,23 @@
 
701
         "-msse2"
 
702
     ]
 
703
 
 
704
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
705
+
 
706
+    DEFINES["DISABLE_NACL"] = True
 
707
+    DEFINES["NO_TCMALLOC"] = True
 
708
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
709
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
710
+
 
711
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
712
+
 
713
+    CXXFLAGS += [
 
714
+        "-mfpu=neon"
 
715
+    ]
 
716
+
 
717
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
718
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
719
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
720
+
 
721
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
722
 
 
723
     CXXFLAGS += [
 
724
--- a/media/webrtc/trunk/webrtc/modules/audio_coding/audio_coding_gn/moz.build
 
725
+++ b/media/webrtc/trunk/webrtc/modules/audio_coding/audio_coding_gn/moz.build
 
726
@@ -121,12 +121,7 @@
 
727
     DEFINES["WEBRTC_POSIX"] = True
 
728
     DEFINES["_FILE_OFFSET_BITS"] = "64"
 
729
 
 
730
-    LOCAL_INCLUDES += [
 
731
-        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
 
732
-    ]
 
733
-
 
734
     OS_LIBS += [
 
735
-        "m",
 
736
         "rt"
 
737
     ]
 
738
 
 
739
@@ -209,6 +204,16 @@
 
740
 
 
741
     DEFINES["_FORTIFY_SOURCE"] = "2"
 
742
 
 
743
+if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
 
744
+
 
745
+    LOCAL_INCLUDES += [
 
746
+        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
 
747
+    ]
 
748
+
 
749
+    OS_LIBS += [
 
750
+        "m"
 
751
+    ]
 
752
+
 
753
 if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
 
754
 
 
755
     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 
756
@@ -257,6 +262,55 @@
 
757
         "-msse2"
 
758
     ]
 
759
 
 
760
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
761
+
 
762
+    DEFINES["DISABLE_NACL"] = True
 
763
+    DEFINES["NO_TCMALLOC"] = True
 
764
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
765
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
766
+
 
767
+    LOCAL_INCLUDES += [
 
768
+        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
 
769
+    ]
 
770
+
 
771
+    OS_LIBS += [
 
772
+        "m"
 
773
+    ]
 
774
+
 
775
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
776
+
 
777
+    CXXFLAGS += [
 
778
+        "-mfpu=neon"
 
779
+    ]
 
780
+
 
781
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
782
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
783
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
784
+
 
785
+    LOCAL_INCLUDES += [
 
786
+        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/include/"
 
787
+    ]
 
788
+
 
789
+if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
790
+
 
791
+    LOCAL_INCLUDES += [
 
792
+        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
 
793
+    ]
 
794
+
 
795
+    OS_LIBS += [
 
796
+        "m"
 
797
+    ]
 
798
+
 
799
+if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
800
+
 
801
+    LOCAL_INCLUDES += [
 
802
+        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
 
803
+    ]
 
804
+
 
805
+    OS_LIBS += [
 
806
+        "m"
 
807
+    ]
 
808
+
 
809
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
810
 
 
811
     CXXFLAGS += [
 
812
--- a/media/webrtc/trunk/webrtc/modules/audio_coding/audio_decoder_factory_interface_gn/moz.build
 
813
+++ b/media/webrtc/trunk/webrtc/modules/audio_coding/audio_decoder_factory_interface_gn/moz.build
 
814
@@ -169,6 +169,19 @@
 
815
     DEFINES["WEBRTC_ARCH_ARM64"] = True
 
816
     DEFINES["WEBRTC_HAS_NEON"] = True
 
817
 
 
818
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
819
+
 
820
+    DEFINES["DISABLE_NACL"] = True
 
821
+    DEFINES["NO_TCMALLOC"] = True
 
822
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
823
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
824
+
 
825
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
826
+
 
827
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
828
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
829
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
830
+
 
831
 if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
 
832
 
 
833
     DEFINES["WEBRTC_ARCH_ARM64"] = True
 
834
--- a/media/webrtc/trunk/webrtc/modules/audio_coding/audio_decoder_interface_gn/moz.build
 
835
+++ b/media/webrtc/trunk/webrtc/modules/audio_coding/audio_decoder_interface_gn/moz.build
 
836
@@ -190,6 +190,23 @@
 
837
         "-msse2"
 
838
     ]
 
839
 
 
840
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
841
+
 
842
+    DEFINES["DISABLE_NACL"] = True
 
843
+    DEFINES["NO_TCMALLOC"] = True
 
844
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
845
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
846
+
 
847
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
848
+
 
849
+    CXXFLAGS += [
 
850
+        "-mfpu=neon"
 
851
+    ]
 
852
+
 
853
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
854
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
855
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
856
+
 
857
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
858
 
 
859
     CXXFLAGS += [
 
860
--- a/media/webrtc/trunk/webrtc/modules/audio_coding/audio_encoder_interface_gn/moz.build
 
861
+++ b/media/webrtc/trunk/webrtc/modules/audio_coding/audio_encoder_interface_gn/moz.build
 
862
@@ -189,6 +189,23 @@
 
863
         "-msse2"
 
864
     ]
 
865
 
 
866
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
867
+
 
868
+    DEFINES["DISABLE_NACL"] = True
 
869
+    DEFINES["NO_TCMALLOC"] = True
 
870
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
871
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
872
+
 
873
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
874
+
 
875
+    CXXFLAGS += [
 
876
+        "-mfpu=neon"
 
877
+    ]
 
878
+
 
879
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
880
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
881
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
882
+
 
883
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
884
 
 
885
     CXXFLAGS += [
 
886
--- a/media/webrtc/trunk/webrtc/modules/audio_coding/audio_format_conversion_gn/moz.build
 
887
+++ b/media/webrtc/trunk/webrtc/modules/audio_coding/audio_format_conversion_gn/moz.build
 
888
@@ -189,6 +189,23 @@
 
889
         "-msse2"
 
890
     ]
 
891
 
 
892
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
893
+
 
894
+    DEFINES["DISABLE_NACL"] = True
 
895
+    DEFINES["NO_TCMALLOC"] = True
 
896
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
897
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
898
+
 
899
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
900
+
 
901
+    CXXFLAGS += [
 
902
+        "-mfpu=neon"
 
903
+    ]
 
904
+
 
905
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
906
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
907
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
908
+
 
909
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
910
 
 
911
     CXXFLAGS += [
 
912
--- a/media/webrtc/trunk/webrtc/modules/audio_coding/audio_format_gn/moz.build
 
913
+++ b/media/webrtc/trunk/webrtc/modules/audio_coding/audio_format_gn/moz.build
 
914
@@ -185,6 +185,23 @@
 
915
         "-msse2"
 
916
     ]
 
917
 
 
918
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
919
+
 
920
+    DEFINES["DISABLE_NACL"] = True
 
921
+    DEFINES["NO_TCMALLOC"] = True
 
922
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
923
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
924
+
 
925
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
926
+
 
927
+    CXXFLAGS += [
 
928
+        "-mfpu=neon"
 
929
+    ]
 
930
+
 
931
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
932
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
933
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
934
+
 
935
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
936
 
 
937
     CXXFLAGS += [
 
938
--- a/media/webrtc/trunk/webrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build
 
939
+++ b/media/webrtc/trunk/webrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build
 
940
@@ -209,6 +209,23 @@
 
941
         "-msse2"
 
942
     ]
 
943
 
 
944
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
945
+
 
946
+    DEFINES["DISABLE_NACL"] = True
 
947
+    DEFINES["NO_TCMALLOC"] = True
 
948
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
949
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
950
+
 
951
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
952
+
 
953
+    CXXFLAGS += [
 
954
+        "-mfpu=neon"
 
955
+    ]
 
956
+
 
957
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
958
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
959
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
960
+
 
961
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
962
 
 
963
     CXXFLAGS += [
 
964
--- a/media/webrtc/trunk/webrtc/modules/audio_coding/builtin_audio_decoder_factory_gn/moz.build
 
965
+++ b/media/webrtc/trunk/webrtc/modules/audio_coding/builtin_audio_decoder_factory_gn/moz.build
 
966
@@ -109,12 +109,7 @@
 
967
     DEFINES["WEBRTC_POSIX"] = True
 
968
     DEFINES["_FILE_OFFSET_BITS"] = "64"
 
969
 
 
970
-    LOCAL_INCLUDES += [
 
971
-        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
 
972
-    ]
 
973
-
 
974
     OS_LIBS += [
 
975
-        "m",
 
976
         "rt"
 
977
     ]
 
978
 
 
979
@@ -197,6 +192,16 @@
 
980
 
 
981
     DEFINES["_FORTIFY_SOURCE"] = "2"
 
982
 
 
983
+if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
 
984
+
 
985
+    LOCAL_INCLUDES += [
 
986
+        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
 
987
+    ]
 
988
+
 
989
+    OS_LIBS += [
 
990
+        "m"
 
991
+    ]
 
992
+
 
993
 if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
 
994
 
 
995
     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 
996
@@ -245,6 +250,55 @@
 
997
         "-msse2"
 
998
     ]
 
999
 
 
1000
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1001
+
 
1002
+    DEFINES["DISABLE_NACL"] = True
 
1003
+    DEFINES["NO_TCMALLOC"] = True
 
1004
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
1005
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1006
+
 
1007
+    LOCAL_INCLUDES += [
 
1008
+        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
 
1009
+    ]
 
1010
+
 
1011
+    OS_LIBS += [
 
1012
+        "m"
 
1013
+    ]
 
1014
+
 
1015
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1016
+
 
1017
+    CXXFLAGS += [
 
1018
+        "-mfpu=neon"
 
1019
+    ]
 
1020
+
 
1021
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
1022
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
1023
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1024
+
 
1025
+    LOCAL_INCLUDES += [
 
1026
+        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/include/"
 
1027
+    ]
 
1028
+
 
1029
+if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1030
+
 
1031
+    LOCAL_INCLUDES += [
 
1032
+        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
 
1033
+    ]
 
1034
+
 
1035
+    OS_LIBS += [
 
1036
+        "m"
 
1037
+    ]
 
1038
+
 
1039
+if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1040
+
 
1041
+    LOCAL_INCLUDES += [
 
1042
+        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
 
1043
+    ]
 
1044
+
 
1045
+    OS_LIBS += [
 
1046
+        "m"
 
1047
+    ]
 
1048
+
 
1049
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
1050
 
 
1051
     CXXFLAGS += [
 
1052
--- a/media/webrtc/trunk/webrtc/modules/audio_coding/cng_gn/moz.build
 
1053
+++ b/media/webrtc/trunk/webrtc/modules/audio_coding/cng_gn/moz.build
 
1054
@@ -202,6 +202,23 @@
 
1055
         "-msse2"
 
1056
     ]
 
1057
 
 
1058
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1059
+
 
1060
+    DEFINES["DISABLE_NACL"] = True
 
1061
+    DEFINES["NO_TCMALLOC"] = True
 
1062
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
1063
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1064
+
 
1065
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1066
+
 
1067
+    CXXFLAGS += [
 
1068
+        "-mfpu=neon"
 
1069
+    ]
 
1070
+
 
1071
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
1072
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
1073
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1074
+
 
1075
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
1076
 
 
1077
     CXXFLAGS += [
 
1078
--- a/media/webrtc/trunk/webrtc/modules/audio_coding/g711_c_gn/moz.build
 
1079
+++ b/media/webrtc/trunk/webrtc/modules/audio_coding/g711_c_gn/moz.build
 
1080
@@ -186,6 +186,23 @@
 
1081
         "-msse2"
 
1082
     ]
 
1083
 
 
1084
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1085
+
 
1086
+    DEFINES["DISABLE_NACL"] = True
 
1087
+    DEFINES["NO_TCMALLOC"] = True
 
1088
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
1089
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1090
+
 
1091
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1092
+
 
1093
+    CFLAGS += [
 
1094
+        "-mfpu=neon"
 
1095
+    ]
 
1096
+
 
1097
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
1098
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
1099
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1100
+
 
1101
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
1102
 
 
1103
     CFLAGS += [
 
1104
--- a/media/webrtc/trunk/webrtc/modules/audio_coding/g711_gn/moz.build
 
1105
+++ b/media/webrtc/trunk/webrtc/modules/audio_coding/g711_gn/moz.build
 
1106
@@ -191,6 +191,23 @@
 
1107
         "-msse2"
 
1108
     ]
 
1109
 
 
1110
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1111
+
 
1112
+    DEFINES["DISABLE_NACL"] = True
 
1113
+    DEFINES["NO_TCMALLOC"] = True
 
1114
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
1115
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1116
+
 
1117
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1118
+
 
1119
+    CXXFLAGS += [
 
1120
+        "-mfpu=neon"
 
1121
+    ]
 
1122
+
 
1123
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
1124
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
1125
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1126
+
 
1127
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
1128
 
 
1129
     CXXFLAGS += [
 
1130
--- a/media/webrtc/trunk/webrtc/modules/audio_coding/g722_c_gn/moz.build
 
1131
+++ b/media/webrtc/trunk/webrtc/modules/audio_coding/g722_c_gn/moz.build
 
1132
@@ -190,6 +190,23 @@
 
1133
         "-msse2"
 
1134
     ]
 
1135
 
 
1136
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1137
+
 
1138
+    DEFINES["DISABLE_NACL"] = True
 
1139
+    DEFINES["NO_TCMALLOC"] = True
 
1140
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
1141
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1142
+
 
1143
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1144
+
 
1145
+    CFLAGS += [
 
1146
+        "-mfpu=neon"
 
1147
+    ]
 
1148
+
 
1149
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
1150
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
1151
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1152
+
 
1153
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
1154
 
 
1155
     CFLAGS += [
 
1156
--- a/media/webrtc/trunk/webrtc/modules/audio_coding/g722_gn/moz.build
 
1157
+++ b/media/webrtc/trunk/webrtc/modules/audio_coding/g722_gn/moz.build
 
1158
@@ -191,6 +191,23 @@
 
1159
         "-msse2"
 
1160
     ]
 
1161
 
 
1162
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1163
+
 
1164
+    DEFINES["DISABLE_NACL"] = True
 
1165
+    DEFINES["NO_TCMALLOC"] = True
 
1166
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
1167
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1168
+
 
1169
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1170
+
 
1171
+    CXXFLAGS += [
 
1172
+        "-mfpu=neon"
 
1173
+    ]
 
1174
+
 
1175
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
1176
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
1177
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1178
+
 
1179
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
1180
 
 
1181
     CXXFLAGS += [
 
1182
--- a/media/webrtc/trunk/webrtc/modules/audio_coding/isac_c_gn/moz.build
 
1183
+++ b/media/webrtc/trunk/webrtc/modules/audio_coding/isac_c_gn/moz.build
 
1184
@@ -230,6 +230,23 @@
 
1185
         "-msse2"
 
1186
     ]
 
1187
 
 
1188
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1189
+
 
1190
+    DEFINES["DISABLE_NACL"] = True
 
1191
+    DEFINES["NO_TCMALLOC"] = True
 
1192
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
1193
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1194
+
 
1195
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1196
+
 
1197
+    CFLAGS += [
 
1198
+        "-mfpu=neon"
 
1199
+    ]
 
1200
+
 
1201
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
1202
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
1203
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1204
+
 
1205
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
1206
 
 
1207
     CFLAGS += [
 
1208
--- a/media/webrtc/trunk/webrtc/modules/audio_coding/isac_common_gn/moz.build
 
1209
+++ b/media/webrtc/trunk/webrtc/modules/audio_coding/isac_common_gn/moz.build
 
1210
@@ -189,6 +189,23 @@
 
1211
         "-msse2"
 
1212
     ]
 
1213
 
 
1214
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1215
+
 
1216
+    DEFINES["DISABLE_NACL"] = True
 
1217
+    DEFINES["NO_TCMALLOC"] = True
 
1218
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
1219
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1220
+
 
1221
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1222
+
 
1223
+    CXXFLAGS += [
 
1224
+        "-mfpu=neon"
 
1225
+    ]
 
1226
+
 
1227
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
1228
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
1229
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1230
+
 
1231
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
1232
 
 
1233
     CXXFLAGS += [
 
1234
--- a/media/webrtc/trunk/webrtc/modules/audio_coding/isac_fix_c_gn/moz.build
 
1235
+++ b/media/webrtc/trunk/webrtc/modules/audio_coding/isac_fix_c_gn/moz.build
 
1236
@@ -151,14 +151,6 @@
 
1237
         "rt"
 
1238
     ]
 
1239
 
 
1240
-    SOURCES += [
 
1241
-        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter_c.c"
 
1242
-    ]
 
1243
-
 
1244
-    UNIFIED_SOURCES += [
 
1245
-        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_c.c"
 
1246
-    ]
 
1247
-
 
1248
 if CONFIG["OS_TARGET"] == "NetBSD":
 
1249
 
 
1250
     DEFINES["USE_X11"] = "1"
 
1251
@@ -250,6 +242,16 @@
 
1252
 
 
1253
     DEFINES["_FORTIFY_SOURCE"] = "2"
 
1254
 
 
1255
+if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
 
1256
+
 
1257
+    SOURCES += [
 
1258
+        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter_c.c"
 
1259
+    ]
 
1260
+
 
1261
+    UNIFIED_SOURCES += [
 
1262
+        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_c.c"
 
1263
+    ]
 
1264
+
 
1265
 if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
 
1266
 
 
1267
     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 
1268
@@ -307,6 +309,56 @@
 
1269
         "-msse2"
 
1270
     ]
 
1271
 
 
1272
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1273
+
 
1274
+    DEFINES["DISABLE_NACL"] = True
 
1275
+    DEFINES["NO_TCMALLOC"] = True
 
1276
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
1277
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1278
+
 
1279
+    SOURCES += [
 
1280
+        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter_c.c"
 
1281
+    ]
 
1282
+
 
1283
+    UNIFIED_SOURCES += [
 
1284
+        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_c.c"
 
1285
+    ]
 
1286
+
 
1287
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1288
+
 
1289
+    CFLAGS += [
 
1290
+        "-mfpu=neon"
 
1291
+    ]
 
1292
+
 
1293
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
1294
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
1295
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1296
+
 
1297
+    SOURCES += [
 
1298
+        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_armv7.S",
 
1299
+        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter_armv6.S"
 
1300
+    ]
 
1301
+
 
1302
+if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1303
+
 
1304
+    SOURCES += [
 
1305
+        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter_c.c"
 
1306
+    ]
 
1307
+
 
1308
+    UNIFIED_SOURCES += [
 
1309
+        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_c.c"
 
1310
+    ]
 
1311
+
 
1312
+if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1313
+
 
1314
+    SOURCES += [
 
1315
+        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_filter_c.c"
 
1316
+    ]
 
1317
+
 
1318
+    UNIFIED_SOURCES += [
 
1319
+        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_c.c"
 
1320
+    ]
 
1321
+
 
1322
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
1323
 
 
1324
     CFLAGS += [
 
1325
--- a/media/webrtc/trunk/webrtc/modules/audio_coding/isac_fix_gn/moz.build
 
1326
+++ b/media/webrtc/trunk/webrtc/modules/audio_coding/isac_fix_gn/moz.build
 
1327
@@ -203,6 +203,23 @@
 
1328
         "-msse2"
 
1329
     ]
 
1330
 
 
1331
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1332
+
 
1333
+    DEFINES["DISABLE_NACL"] = True
 
1334
+    DEFINES["NO_TCMALLOC"] = True
 
1335
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
1336
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1337
+
 
1338
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1339
+
 
1340
+    CXXFLAGS += [
 
1341
+        "-mfpu=neon"
 
1342
+    ]
 
1343
+
 
1344
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
1345
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
1346
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1347
+
 
1348
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
1349
 
 
1350
     CXXFLAGS += [
 
1351
--- a/media/webrtc/trunk/webrtc/modules/audio_coding/isac_gn/moz.build
 
1352
+++ b/media/webrtc/trunk/webrtc/modules/audio_coding/isac_gn/moz.build
 
1353
@@ -201,6 +201,23 @@
 
1354
         "-msse2"
 
1355
     ]
 
1356
 
 
1357
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1358
+
 
1359
+    DEFINES["DISABLE_NACL"] = True
 
1360
+    DEFINES["NO_TCMALLOC"] = True
 
1361
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
1362
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1363
+
 
1364
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1365
+
 
1366
+    CXXFLAGS += [
 
1367
+        "-mfpu=neon"
 
1368
+    ]
 
1369
+
 
1370
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
1371
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
1372
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1373
+
 
1374
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
1375
 
 
1376
     CXXFLAGS += [
 
1377
--- a/media/webrtc/trunk/webrtc/modules/audio_coding/isac_neon_gn/moz.build
 
1378
+++ b/media/webrtc/trunk/webrtc/modules/audio_coding/isac_neon_gn/moz.build
 
1379
@@ -47,7 +47,6 @@
 
1380
     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
 
1381
     DEFINES["NDEBUG"] = True
 
1382
     DEFINES["NVALGRIND"] = True
 
1383
-    DEFINES["_FORTIFY_SOURCE"] = "2"
 
1384
 
 
1385
 if CONFIG["MOZ_DEBUG"] == "1":
 
1386
 
 
1387
@@ -77,6 +76,24 @@
 
1388
     DEFINES["WEBRTC_ARCH_ARM64"] = True
 
1389
     DEFINES["WEBRTC_BSD"] = True
 
1390
 
 
1391
+if CONFIG["OS_TARGET"] == "Linux":
 
1392
+
 
1393
+    DEFINES["USE_NSS_CERTS"] = "1"
 
1394
+    DEFINES["USE_X11"] = "1"
 
1395
+    DEFINES["WEBRTC_LINUX"] = True
 
1396
+
 
1397
+    OS_LIBS += [
 
1398
+        "rt"
 
1399
+    ]
 
1400
+
 
1401
+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
 
1402
+
 
1403
+    DEFINES["_FORTIFY_SOURCE"] = "2"
 
1404
+
 
1405
+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
 
1406
+
 
1407
+    DEFINES["_FORTIFY_SOURCE"] = "2"
 
1408
+
 
1409
 if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
 
1410
 
 
1411
     DEFINES["WEBRTC_ARCH_ARM64"] = True
 
1412
@@ -85,6 +102,21 @@
 
1413
 
 
1414
     CFLAGS += [
 
1415
         "-mfpu=neon"
 
1416
+    ]
 
1417
+
 
1418
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
1419
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
1420
+
 
1421
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1422
+
 
1423
+    DEFINES["DISABLE_NACL"] = True
 
1424
+    DEFINES["NO_TCMALLOC"] = True
 
1425
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
1426
+
 
1427
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1428
+
 
1429
+    CFLAGS += [
 
1430
+        "-mfpu=neon"
 
1431
     ]
 
1432
 
 
1433
     DEFINES["WEBRTC_ARCH_ARM"] = True
 
1434
--- a/media/webrtc/trunk/webrtc/modules/audio_coding/neteq_gn/moz.build
 
1435
+++ b/media/webrtc/trunk/webrtc/modules/audio_coding/neteq_gn/moz.build
 
1436
@@ -150,17 +150,11 @@
 
1437
 
 
1438
     DEFINES["USE_NSS_CERTS"] = "1"
 
1439
     DEFINES["USE_X11"] = "1"
 
1440
-    DEFINES["WEBRTC_CODEC_ISAC"] = True
 
1441
     DEFINES["WEBRTC_LINUX"] = True
 
1442
     DEFINES["WEBRTC_POSIX"] = True
 
1443
     DEFINES["_FILE_OFFSET_BITS"] = "64"
 
1444
 
 
1445
-    LOCAL_INCLUDES += [
 
1446
-        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
 
1447
-    ]
 
1448
-
 
1449
     OS_LIBS += [
 
1450
-        "m",
 
1451
         "rt"
 
1452
     ]
 
1453
 
 
1454
@@ -246,6 +240,18 @@
 
1455
 
 
1456
     DEFINES["_FORTIFY_SOURCE"] = "2"
 
1457
 
 
1458
+if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
 
1459
+
 
1460
+    DEFINES["WEBRTC_CODEC_ISAC"] = True
 
1461
+
 
1462
+    LOCAL_INCLUDES += [
 
1463
+        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
 
1464
+    ]
 
1465
+
 
1466
+    OS_LIBS += [
 
1467
+        "m"
 
1468
+    ]
 
1469
+
 
1470
 if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
 
1471
 
 
1472
     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 
1473
@@ -294,6 +300,57 @@
 
1474
         "-msse2"
 
1475
     ]
 
1476
 
 
1477
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1478
+
 
1479
+    DEFINES["DISABLE_NACL"] = True
 
1480
+    DEFINES["NO_TCMALLOC"] = True
 
1481
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
1482
+    DEFINES["WEBRTC_CODEC_ISAC"] = True
 
1483
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1484
+
 
1485
+    LOCAL_INCLUDES += [
 
1486
+        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
 
1487
+    ]
 
1488
+
 
1489
+    OS_LIBS += [
 
1490
+        "m"
 
1491
+    ]
 
1492
+
 
1493
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1494
+
 
1495
+    CXXFLAGS += [
 
1496
+        "-mfpu=neon"
 
1497
+    ]
 
1498
+
 
1499
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
1500
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
1501
+    DEFINES["WEBRTC_CODEC_ISACFX"] = True
 
1502
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1503
+
 
1504
+if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1505
+
 
1506
+    DEFINES["WEBRTC_CODEC_ISAC"] = True
 
1507
+
 
1508
+    LOCAL_INCLUDES += [
 
1509
+        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
 
1510
+    ]
 
1511
+
 
1512
+    OS_LIBS += [
 
1513
+        "m"
 
1514
+    ]
 
1515
+
 
1516
+if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1517
+
 
1518
+    DEFINES["WEBRTC_CODEC_ISAC"] = True
 
1519
+
 
1520
+    LOCAL_INCLUDES += [
 
1521
+        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
 
1522
+    ]
 
1523
+
 
1524
+    OS_LIBS += [
 
1525
+        "m"
 
1526
+    ]
 
1527
+
 
1528
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
1529
 
 
1530
     CXXFLAGS += [
 
1531
--- a/media/webrtc/trunk/webrtc/modules/audio_coding/pcm16b_c_gn/moz.build
 
1532
+++ b/media/webrtc/trunk/webrtc/modules/audio_coding/pcm16b_c_gn/moz.build
 
1533
@@ -186,6 +186,23 @@
 
1534
         "-msse2"
 
1535
     ]
 
1536
 
 
1537
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1538
+
 
1539
+    DEFINES["DISABLE_NACL"] = True
 
1540
+    DEFINES["NO_TCMALLOC"] = True
 
1541
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
1542
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1543
+
 
1544
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1545
+
 
1546
+    CFLAGS += [
 
1547
+        "-mfpu=neon"
 
1548
+    ]
 
1549
+
 
1550
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
1551
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
1552
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1553
+
 
1554
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
1555
 
 
1556
     CFLAGS += [
 
1557
--- a/media/webrtc/trunk/webrtc/modules/audio_coding/pcm16b_gn/moz.build
 
1558
+++ b/media/webrtc/trunk/webrtc/modules/audio_coding/pcm16b_gn/moz.build
 
1559
@@ -192,6 +192,23 @@
 
1560
         "-msse2"
 
1561
     ]
 
1562
 
 
1563
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1564
+
 
1565
+    DEFINES["DISABLE_NACL"] = True
 
1566
+    DEFINES["NO_TCMALLOC"] = True
 
1567
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
1568
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1569
+
 
1570
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1571
+
 
1572
+    CXXFLAGS += [
 
1573
+        "-mfpu=neon"
 
1574
+    ]
 
1575
+
 
1576
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
1577
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
1578
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1579
+
 
1580
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
1581
 
 
1582
     CXXFLAGS += [
 
1583
--- a/media/webrtc/trunk/webrtc/modules/audio_coding/rent_a_codec_gn/moz.build
 
1584
+++ b/media/webrtc/trunk/webrtc/modules/audio_coding/rent_a_codec_gn/moz.build
 
1585
@@ -110,12 +110,7 @@
 
1586
     DEFINES["WEBRTC_POSIX"] = True
 
1587
     DEFINES["_FILE_OFFSET_BITS"] = "64"
 
1588
 
 
1589
-    LOCAL_INCLUDES += [
 
1590
-        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
 
1591
-    ]
 
1592
-
 
1593
     OS_LIBS += [
 
1594
-        "m",
 
1595
         "rt"
 
1596
     ]
 
1597
 
 
1598
@@ -198,6 +193,16 @@
 
1599
 
 
1600
     DEFINES["_FORTIFY_SOURCE"] = "2"
 
1601
 
 
1602
+if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
 
1603
+
 
1604
+    LOCAL_INCLUDES += [
 
1605
+        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
 
1606
+    ]
 
1607
+
 
1608
+    OS_LIBS += [
 
1609
+        "m"
 
1610
+    ]
 
1611
+
 
1612
 if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
 
1613
 
 
1614
     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 
1615
@@ -246,6 +251,55 @@
 
1616
         "-msse2"
 
1617
     ]
 
1618
 
 
1619
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1620
+
 
1621
+    DEFINES["DISABLE_NACL"] = True
 
1622
+    DEFINES["NO_TCMALLOC"] = True
 
1623
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
1624
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1625
+
 
1626
+    LOCAL_INCLUDES += [
 
1627
+        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
 
1628
+    ]
 
1629
+
 
1630
+    OS_LIBS += [
 
1631
+        "m"
 
1632
+    ]
 
1633
+
 
1634
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1635
+
 
1636
+    CXXFLAGS += [
 
1637
+        "-mfpu=neon"
 
1638
+    ]
 
1639
+
 
1640
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
1641
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
1642
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1643
+
 
1644
+    LOCAL_INCLUDES += [
 
1645
+        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/include/"
 
1646
+    ]
 
1647
+
 
1648
+if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1649
+
 
1650
+    LOCAL_INCLUDES += [
 
1651
+        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
 
1652
+    ]
 
1653
+
 
1654
+    OS_LIBS += [
 
1655
+        "m"
 
1656
+    ]
 
1657
+
 
1658
+if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1659
+
 
1660
+    LOCAL_INCLUDES += [
 
1661
+        "/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/include/"
 
1662
+    ]
 
1663
+
 
1664
+    OS_LIBS += [
 
1665
+        "m"
 
1666
+    ]
 
1667
+
 
1668
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
1669
 
 
1670
     CXXFLAGS += [
 
1671
--- a/media/webrtc/trunk/webrtc/modules/audio_coding/webrtc_opus_c_gn/moz.build
 
1672
+++ b/media/webrtc/trunk/webrtc/modules/audio_coding/webrtc_opus_c_gn/moz.build
 
1673
@@ -190,6 +190,23 @@
 
1674
         "-msse2"
 
1675
     ]
 
1676
 
 
1677
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1678
+
 
1679
+    DEFINES["DISABLE_NACL"] = True
 
1680
+    DEFINES["NO_TCMALLOC"] = True
 
1681
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
1682
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1683
+
 
1684
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1685
+
 
1686
+    CFLAGS += [
 
1687
+        "-mfpu=neon"
 
1688
+    ]
 
1689
+
 
1690
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
1691
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
1692
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1693
+
 
1694
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
1695
 
 
1696
     CFLAGS += [
 
1697
--- a/media/webrtc/trunk/webrtc/modules/audio_coding/webrtc_opus_gn/moz.build
 
1698
+++ b/media/webrtc/trunk/webrtc/modules/audio_coding/webrtc_opus_gn/moz.build
 
1699
@@ -202,6 +202,23 @@
 
1700
         "-msse2"
 
1701
     ]
 
1702
 
 
1703
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1704
+
 
1705
+    DEFINES["DISABLE_NACL"] = True
 
1706
+    DEFINES["NO_TCMALLOC"] = True
 
1707
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
1708
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1709
+
 
1710
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1711
+
 
1712
+    CXXFLAGS += [
 
1713
+        "-mfpu=neon"
 
1714
+    ]
 
1715
+
 
1716
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
1717
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
1718
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1719
+
 
1720
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
1721
 
 
1722
     CXXFLAGS += [
 
1723
--- a/media/webrtc/trunk/webrtc/modules/audio_conference_mixer/audio_conference_mixer_gn/moz.build
 
1724
+++ b/media/webrtc/trunk/webrtc/modules/audio_conference_mixer/audio_conference_mixer_gn/moz.build
 
1725
@@ -202,6 +202,23 @@
 
1726
         "-msse2"
 
1727
     ]
 
1728
 
 
1729
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1730
+
 
1731
+    DEFINES["DISABLE_NACL"] = True
 
1732
+    DEFINES["NO_TCMALLOC"] = True
 
1733
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
1734
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1735
+
 
1736
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1737
+
 
1738
+    CXXFLAGS += [
 
1739
+        "-mfpu=neon"
 
1740
+    ]
 
1741
+
 
1742
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
1743
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
1744
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1745
+
 
1746
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
1747
 
 
1748
     CXXFLAGS += [
 
1749
--- a/media/webrtc/trunk/webrtc/modules/audio_device/audio_device_gn/moz.build
 
1750
+++ b/media/webrtc/trunk/webrtc/modules/audio_device/audio_device_gn/moz.build
 
1751
@@ -120,7 +120,6 @@
 
1752
     ]
 
1753
 
 
1754
     OS_LIBS += [
 
1755
-        "m",
 
1756
         "rt"
 
1757
     ]
 
1758
 
 
1759
@@ -197,6 +196,12 @@
 
1760
 
 
1761
     DEFINES["_FORTIFY_SOURCE"] = "2"
 
1762
 
 
1763
+if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
 
1764
+
 
1765
+    OS_LIBS += [
 
1766
+        "m"
 
1767
+    ]
 
1768
+
 
1769
 if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
 
1770
 
 
1771
     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 
1772
@@ -233,6 +238,39 @@
 
1773
         "-msse2"
 
1774
     ]
 
1775
 
 
1776
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1777
+
 
1778
+    DEFINES["DISABLE_NACL"] = True
 
1779
+    DEFINES["NO_TCMALLOC"] = True
 
1780
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
1781
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1782
+
 
1783
+    OS_LIBS += [
 
1784
+        "m"
 
1785
+    ]
 
1786
+
 
1787
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1788
+
 
1789
+    CXXFLAGS += [
 
1790
+        "-mfpu=neon"
 
1791
+    ]
 
1792
+
 
1793
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
1794
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
1795
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1796
+
 
1797
+if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1798
+
 
1799
+    OS_LIBS += [
 
1800
+        "m"
 
1801
+    ]
 
1802
+
 
1803
+if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1804
+
 
1805
+    OS_LIBS += [
 
1806
+        "m"
 
1807
+    ]
 
1808
+
 
1809
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
1810
 
 
1811
     CXXFLAGS += [
 
1812
--- a/media/webrtc/trunk/webrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
 
1813
+++ b/media/webrtc/trunk/webrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
 
1814
@@ -189,6 +189,23 @@
 
1815
         "-msse2"
 
1816
     ]
 
1817
 
 
1818
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1819
+
 
1820
+    DEFINES["DISABLE_NACL"] = True
 
1821
+    DEFINES["NO_TCMALLOC"] = True
 
1822
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
1823
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1824
+
 
1825
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1826
+
 
1827
+    CXXFLAGS += [
 
1828
+        "-mfpu=neon"
 
1829
+    ]
 
1830
+
 
1831
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
1832
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
1833
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1834
+
 
1835
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
1836
 
 
1837
     CXXFLAGS += [
 
1838
--- a/media/webrtc/trunk/webrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
 
1839
+++ b/media/webrtc/trunk/webrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
 
1840
@@ -199,6 +199,23 @@
 
1841
         "-msse2"
 
1842
     ]
 
1843
 
 
1844
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1845
+
 
1846
+    DEFINES["DISABLE_NACL"] = True
 
1847
+    DEFINES["NO_TCMALLOC"] = True
 
1848
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
1849
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1850
+
 
1851
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1852
+
 
1853
+    CXXFLAGS += [
 
1854
+        "-mfpu=neon"
 
1855
+    ]
 
1856
+
 
1857
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
1858
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
1859
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1860
+
 
1861
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
1862
 
 
1863
     CXXFLAGS += [
 
1864
--- a/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_c_gn/moz.build
 
1865
+++ b/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_c_gn/moz.build
 
1866
@@ -111,11 +111,6 @@
 
1867
         "rt"
 
1868
     ]
 
1869
 
 
1870
-    UNIFIED_SOURCES += [
 
1871
-        "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/noise_suppression.c",
 
1872
-        "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/ns_core.c"
 
1873
-    ]
 
1874
-
 
1875
 if CONFIG["OS_TARGET"] == "NetBSD":
 
1876
 
 
1877
     DEFINES["USE_X11"] = "1"
 
1878
@@ -198,6 +193,13 @@
 
1879
 
 
1880
     DEFINES["_FORTIFY_SOURCE"] = "2"
 
1881
 
 
1882
+if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
 
1883
+
 
1884
+    UNIFIED_SOURCES += [
 
1885
+        "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/noise_suppression.c",
 
1886
+        "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/ns_core.c"
 
1887
+    ]
 
1888
+
 
1889
 if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
 
1890
 
 
1891
     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 
1892
@@ -266,6 +268,49 @@
 
1893
 
 
1894
     UNIFIED_SOURCES += [
 
1895
         "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/noise_suppression.c",
 
1896
+        "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/ns_core.c"
 
1897
+    ]
 
1898
+
 
1899
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1900
+
 
1901
+    DEFINES["DISABLE_NACL"] = True
 
1902
+    DEFINES["NO_TCMALLOC"] = True
 
1903
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
1904
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1905
+
 
1906
+    UNIFIED_SOURCES += [
 
1907
+        "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/noise_suppression_x.c",
 
1908
+        "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/nsx_core.c",
 
1909
+        "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/nsx_core_c.c"
 
1910
+    ]
 
1911
+
 
1912
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1913
+
 
1914
+    CFLAGS += [
 
1915
+        "-mfpu=neon"
 
1916
+    ]
 
1917
+
 
1918
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
1919
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
1920
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1921
+
 
1922
+    UNIFIED_SOURCES += [
 
1923
+        "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/noise_suppression_x.c",
 
1924
+        "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/nsx_core.c",
 
1925
+        "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/nsx_core_c.c"
 
1926
+    ]
 
1927
+
 
1928
+if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1929
+
 
1930
+    UNIFIED_SOURCES += [
 
1931
+        "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/noise_suppression.c",
 
1932
+        "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/ns_core.c"
 
1933
+    ]
 
1934
+
 
1935
+if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1936
+
 
1937
+    UNIFIED_SOURCES += [
 
1938
+        "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/noise_suppression.c",
 
1939
         "/media/webrtc/trunk/webrtc/modules/audio_processing/ns/ns_core.c"
 
1940
     ]
 
1941
 
 
1942
--- a/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_gn/moz.build
 
1943
+++ b/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_gn/moz.build
 
1944
@@ -165,7 +165,6 @@
 
1945
     DEFINES["USE_NSS_CERTS"] = "1"
 
1946
     DEFINES["USE_X11"] = "1"
 
1947
     DEFINES["WEBRTC_LINUX"] = True
 
1948
-    DEFINES["WEBRTC_NS_FLOAT"] = True
 
1949
     DEFINES["WEBRTC_POSIX"] = True
 
1950
     DEFINES["_FILE_OFFSET_BITS"] = "64"
 
1951
 
 
1952
@@ -244,6 +243,10 @@
 
1953
 
 
1954
     DEFINES["_FORTIFY_SOURCE"] = "2"
 
1955
 
 
1956
+if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
 
1957
+
 
1958
+    DEFINES["WEBRTC_NS_FLOAT"] = True
 
1959
+
 
1960
 if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
 
1961
 
 
1962
     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 
1963
@@ -291,6 +294,33 @@
 
1964
 
 
1965
     DEFINES["WEBRTC_NS_FLOAT"] = True
 
1966
 
 
1967
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1968
+
 
1969
+    DEFINES["DISABLE_NACL"] = True
 
1970
+    DEFINES["NO_TCMALLOC"] = True
 
1971
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
1972
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1973
+    DEFINES["WEBRTC_NS_FIXED"] = True
 
1974
+
 
1975
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1976
+
 
1977
+    CXXFLAGS += [
 
1978
+        "-mfpu=neon"
 
1979
+    ]
 
1980
+
 
1981
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
1982
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
1983
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
1984
+    DEFINES["WEBRTC_NS_FIXED"] = True
 
1985
+
 
1986
+if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1987
+
 
1988
+    DEFINES["WEBRTC_NS_FLOAT"] = True
 
1989
+
 
1990
+if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
1991
+
 
1992
+    DEFINES["WEBRTC_NS_FLOAT"] = True
 
1993
+
 
1994
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
1995
 
 
1996
     CXXFLAGS += [
 
1997
--- a/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_c_gn/moz.build
 
1998
+++ b/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_c_gn/moz.build
 
1999
@@ -38,7 +38,6 @@
 
2000
     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
 
2001
     DEFINES["NDEBUG"] = True
 
2002
     DEFINES["NVALGRIND"] = True
 
2003
-    DEFINES["_FORTIFY_SOURCE"] = "2"
 
2004
 
 
2005
 if CONFIG["MOZ_DEBUG"] == "1":
 
2006
 
 
2007
@@ -68,6 +67,24 @@
 
2008
     DEFINES["WEBRTC_ARCH_ARM64"] = True
 
2009
     DEFINES["WEBRTC_BSD"] = True
 
2010
 
 
2011
+if CONFIG["OS_TARGET"] == "Linux":
 
2012
+
 
2013
+    DEFINES["USE_NSS_CERTS"] = "1"
 
2014
+    DEFINES["USE_X11"] = "1"
 
2015
+    DEFINES["WEBRTC_LINUX"] = True
 
2016
+
 
2017
+    OS_LIBS += [
 
2018
+        "rt"
 
2019
+    ]
 
2020
+
 
2021
+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
 
2022
+
 
2023
+    DEFINES["_FORTIFY_SOURCE"] = "2"
 
2024
+
 
2025
+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
 
2026
+
 
2027
+    DEFINES["_FORTIFY_SOURCE"] = "2"
 
2028
+
 
2029
 if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
 
2030
 
 
2031
     DEFINES["WEBRTC_ARCH_ARM64"] = True
 
2032
@@ -76,6 +93,21 @@
 
2033
 
 
2034
     CFLAGS += [
 
2035
         "-mfpu=neon"
 
2036
+    ]
 
2037
+
 
2038
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
2039
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
2040
+
 
2041
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2042
+
 
2043
+    DEFINES["DISABLE_NACL"] = True
 
2044
+    DEFINES["NO_TCMALLOC"] = True
 
2045
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
2046
+
 
2047
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2048
+
 
2049
+    CFLAGS += [
 
2050
+        "-mfpu=neon"
 
2051
     ]
 
2052
 
 
2053
     DEFINES["WEBRTC_ARCH_ARM"] = True
 
2054
--- a/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_gn/moz.build
 
2055
+++ b/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_neon_gn/moz.build
 
2056
@@ -44,7 +44,6 @@
 
2057
     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
 
2058
     DEFINES["NDEBUG"] = True
 
2059
     DEFINES["NVALGRIND"] = True
 
2060
-    DEFINES["_FORTIFY_SOURCE"] = "2"
 
2061
 
 
2062
 if CONFIG["MOZ_DEBUG"] == "1":
 
2063
 
 
2064
@@ -74,6 +73,24 @@
 
2065
     DEFINES["WEBRTC_ARCH_ARM64"] = True
 
2066
     DEFINES["WEBRTC_BSD"] = True
 
2067
 
 
2068
+if CONFIG["OS_TARGET"] == "Linux":
 
2069
+
 
2070
+    DEFINES["USE_NSS_CERTS"] = "1"
 
2071
+    DEFINES["USE_X11"] = "1"
 
2072
+    DEFINES["WEBRTC_LINUX"] = True
 
2073
+
 
2074
+    OS_LIBS += [
 
2075
+        "rt"
 
2076
+    ]
 
2077
+
 
2078
+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
 
2079
+
 
2080
+    DEFINES["_FORTIFY_SOURCE"] = "2"
 
2081
+
 
2082
+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
 
2083
+
 
2084
+    DEFINES["_FORTIFY_SOURCE"] = "2"
 
2085
+
 
2086
 if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
 
2087
 
 
2088
     DEFINES["WEBRTC_ARCH_ARM64"] = True
 
2089
@@ -82,6 +99,21 @@
 
2090
 
 
2091
     CXXFLAGS += [
 
2092
         "-mfpu=neon"
 
2093
+    ]
 
2094
+
 
2095
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
2096
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
2097
+
 
2098
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2099
+
 
2100
+    DEFINES["DISABLE_NACL"] = True
 
2101
+    DEFINES["NO_TCMALLOC"] = True
 
2102
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
2103
+
 
2104
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2105
+
 
2106
+    CXXFLAGS += [
 
2107
+        "-mfpu=neon"
 
2108
     ]
 
2109
 
 
2110
     DEFINES["WEBRTC_ARCH_ARM"] = True
 
2111
--- a/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn/moz.build
 
2112
+++ b/media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_sse2_gn/moz.build
 
2113
@@ -112,6 +112,7 @@
 
2114
 if CONFIG["OS_TARGET"] == "NetBSD":
 
2115
 
 
2116
     CXXFLAGS += [
 
2117
+        "-msse2",
 
2118
         "-msse2"
 
2119
     ]
 
2120
 
 
2121
@@ -123,6 +124,7 @@
 
2122
 if CONFIG["OS_TARGET"] == "OpenBSD":
 
2123
 
 
2124
     CXXFLAGS += [
 
2125
+        "-msse2",
 
2126
         "-msse2"
 
2127
     ]
 
2128
 
 
2129
--- a/media/webrtc/trunk/webrtc/modules/bitrate_controller/bitrate_controller_gn/moz.build
 
2130
+++ b/media/webrtc/trunk/webrtc/modules/bitrate_controller/bitrate_controller_gn/moz.build
 
2131
@@ -209,6 +209,23 @@
 
2132
         "-msse2"
 
2133
     ]
 
2134
 
 
2135
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2136
+
 
2137
+    DEFINES["DISABLE_NACL"] = True
 
2138
+    DEFINES["NO_TCMALLOC"] = True
 
2139
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
2140
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2141
+
 
2142
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2143
+
 
2144
+    CXXFLAGS += [
 
2145
+        "-mfpu=neon"
 
2146
+    ]
 
2147
+
 
2148
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
2149
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
2150
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2151
+
 
2152
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
2153
 
 
2154
     CXXFLAGS += [
 
2155
--- a/media/webrtc/trunk/webrtc/modules/congestion_controller/congestion_controller_gn/moz.build
 
2156
+++ b/media/webrtc/trunk/webrtc/modules/congestion_controller/congestion_controller_gn/moz.build
 
2157
@@ -110,7 +110,6 @@
 
2158
     DEFINES["_FILE_OFFSET_BITS"] = "64"
 
2159
 
 
2160
     OS_LIBS += [
 
2161
-        "m",
 
2162
         "rt"
 
2163
     ]
 
2164
 
 
2165
@@ -183,6 +182,12 @@
 
2166
 
 
2167
     DEFINES["_FORTIFY_SOURCE"] = "2"
 
2168
 
 
2169
+if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
 
2170
+
 
2171
+    OS_LIBS += [
 
2172
+        "m"
 
2173
+    ]
 
2174
+
 
2175
 if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
 
2176
 
 
2177
     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 
2178
@@ -219,6 +224,39 @@
 
2179
         "-msse2"
 
2180
     ]
 
2181
 
 
2182
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2183
+
 
2184
+    DEFINES["DISABLE_NACL"] = True
 
2185
+    DEFINES["NO_TCMALLOC"] = True
 
2186
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
2187
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2188
+
 
2189
+    OS_LIBS += [
 
2190
+        "m"
 
2191
+    ]
 
2192
+
 
2193
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2194
+
 
2195
+    CXXFLAGS += [
 
2196
+        "-mfpu=neon"
 
2197
+    ]
 
2198
+
 
2199
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
2200
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
2201
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2202
+
 
2203
+if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2204
+
 
2205
+    OS_LIBS += [
 
2206
+        "m"
 
2207
+    ]
 
2208
+
 
2209
+if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2210
+
 
2211
+    OS_LIBS += [
 
2212
+        "m"
 
2213
+    ]
 
2214
+
 
2215
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
2216
 
 
2217
     CXXFLAGS += [
 
2218
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
 
2219
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
 
2220
@@ -90,6 +90,7 @@
 
2221
 if CONFIG["OS_TARGET"] == "NetBSD":
 
2222
 
 
2223
     CXXFLAGS += [
 
2224
+        "-msse2",
 
2225
         "-msse2"
 
2226
     ]
 
2227
 
 
2228
@@ -101,6 +102,7 @@
 
2229
 if CONFIG["OS_TARGET"] == "OpenBSD":
 
2230
 
 
2231
     CXXFLAGS += [
 
2232
+        "-msse2",
 
2233
         "-msse2"
 
2234
     ]
 
2235
 
 
2236
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_gn/moz.build
 
2237
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_gn/moz.build
 
2238
@@ -337,6 +337,23 @@
 
2239
         "-msse2"
 
2240
     ]
 
2241
 
 
2242
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2243
+
 
2244
+    DEFINES["DISABLE_NACL"] = True
 
2245
+    DEFINES["NO_TCMALLOC"] = True
 
2246
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
2247
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2248
+
 
2249
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2250
+
 
2251
+    CXXFLAGS += [
 
2252
+        "-mfpu=neon"
 
2253
+    ]
 
2254
+
 
2255
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
2256
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
2257
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2258
+
 
2259
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
2260
 
 
2261
     CXXFLAGS += [
 
2262
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/primitives_gn/moz.build
 
2263
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/primitives_gn/moz.build
 
2264
@@ -149,6 +149,23 @@
 
2265
         "-msse2"
 
2266
     ]
 
2267
 
 
2268
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2269
+
 
2270
+    DEFINES["DISABLE_NACL"] = True
 
2271
+    DEFINES["NO_TCMALLOC"] = True
 
2272
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
2273
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2274
+
 
2275
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2276
+
 
2277
+    CXXFLAGS += [
 
2278
+        "-mfpu=neon"
 
2279
+    ]
 
2280
+
 
2281
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
2282
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
2283
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2284
+
 
2285
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
2286
 
 
2287
     CXXFLAGS += [
 
2288
--- a/media/webrtc/trunk/webrtc/modules/media_file/media_file_gn/moz.build
 
2289
+++ b/media/webrtc/trunk/webrtc/modules/media_file/media_file_gn/moz.build
 
2290
@@ -201,6 +201,23 @@
 
2291
         "-msse2"
 
2292
     ]
 
2293
 
 
2294
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2295
+
 
2296
+    DEFINES["DISABLE_NACL"] = True
 
2297
+    DEFINES["NO_TCMALLOC"] = True
 
2298
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
2299
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2300
+
 
2301
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2302
+
 
2303
+    CXXFLAGS += [
 
2304
+        "-mfpu=neon"
 
2305
+    ]
 
2306
+
 
2307
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
2308
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
2309
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2310
+
 
2311
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
2312
 
 
2313
     CXXFLAGS += [
 
2314
--- a/media/webrtc/trunk/webrtc/modules/pacing/pacing_gn/moz.build
 
2315
+++ b/media/webrtc/trunk/webrtc/modules/pacing/pacing_gn/moz.build
 
2316
@@ -210,6 +210,23 @@
 
2317
         "-msse2"
 
2318
     ]
 
2319
 
 
2320
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2321
+
 
2322
+    DEFINES["DISABLE_NACL"] = True
 
2323
+    DEFINES["NO_TCMALLOC"] = True
 
2324
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
2325
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2326
+
 
2327
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2328
+
 
2329
+    CXXFLAGS += [
 
2330
+        "-mfpu=neon"
 
2331
+    ]
 
2332
+
 
2333
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
2334
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
2335
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2336
+
 
2337
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
2338
 
 
2339
     CXXFLAGS += [
 
2340
--- a/media/webrtc/trunk/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
 
2341
+++ b/media/webrtc/trunk/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
 
2342
@@ -209,6 +209,23 @@
 
2343
         "-msse2"
 
2344
     ]
 
2345
 
 
2346
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2347
+
 
2348
+    DEFINES["DISABLE_NACL"] = True
 
2349
+    DEFINES["NO_TCMALLOC"] = True
 
2350
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
2351
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2352
+
 
2353
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2354
+
 
2355
+    CXXFLAGS += [
 
2356
+        "-mfpu=neon"
 
2357
+    ]
 
2358
+
 
2359
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
2360
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
2361
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2362
+
 
2363
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
2364
 
 
2365
     CXXFLAGS += [
 
2366
--- a/media/webrtc/trunk/webrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
 
2367
+++ b/media/webrtc/trunk/webrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
 
2368
@@ -280,6 +280,23 @@
 
2369
         "-msse2"
 
2370
     ]
 
2371
 
 
2372
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2373
+
 
2374
+    DEFINES["DISABLE_NACL"] = True
 
2375
+    DEFINES["NO_TCMALLOC"] = True
 
2376
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
2377
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2378
+
 
2379
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2380
+
 
2381
+    CXXFLAGS += [
 
2382
+        "-mfpu=neon"
 
2383
+    ]
 
2384
+
 
2385
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
2386
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
2387
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2388
+
 
2389
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
2390
 
 
2391
     CXXFLAGS += [
 
2392
--- a/media/webrtc/trunk/webrtc/modules/utility/utility_gn/moz.build
 
2393
+++ b/media/webrtc/trunk/webrtc/modules/utility/utility_gn/moz.build
 
2394
@@ -105,7 +105,6 @@
 
2395
     DEFINES["_FILE_OFFSET_BITS"] = "64"
 
2396
 
 
2397
     OS_LIBS += [
 
2398
-        "m",
 
2399
         "rt"
 
2400
     ]
 
2401
 
 
2402
@@ -178,6 +177,12 @@
 
2403
 
 
2404
     DEFINES["_FORTIFY_SOURCE"] = "2"
 
2405
 
 
2406
+if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
 
2407
+
 
2408
+    OS_LIBS += [
 
2409
+        "m"
 
2410
+    ]
 
2411
+
 
2412
 if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
 
2413
 
 
2414
     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 
2415
@@ -214,6 +219,39 @@
 
2416
         "-msse2"
 
2417
     ]
 
2418
 
 
2419
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2420
+
 
2421
+    DEFINES["DISABLE_NACL"] = True
 
2422
+    DEFINES["NO_TCMALLOC"] = True
 
2423
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
2424
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2425
+
 
2426
+    OS_LIBS += [
 
2427
+        "m"
 
2428
+    ]
 
2429
+
 
2430
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2431
+
 
2432
+    CXXFLAGS += [
 
2433
+        "-mfpu=neon"
 
2434
+    ]
 
2435
+
 
2436
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
2437
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
2438
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2439
+
 
2440
+if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2441
+
 
2442
+    OS_LIBS += [
 
2443
+        "m"
 
2444
+    ]
 
2445
+
 
2446
+if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2447
+
 
2448
+    OS_LIBS += [
 
2449
+        "m"
 
2450
+    ]
 
2451
+
 
2452
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
2453
 
 
2454
     CXXFLAGS += [
 
2455
--- a/media/webrtc/trunk/webrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
 
2456
+++ b/media/webrtc/trunk/webrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
 
2457
@@ -126,7 +126,6 @@
 
2458
     DEFINES["_FILE_OFFSET_BITS"] = "64"
 
2459
 
 
2460
     OS_LIBS += [
 
2461
-        "m",
 
2462
         "rt"
 
2463
     ]
 
2464
 
 
2465
@@ -232,6 +231,12 @@
 
2466
 
 
2467
     DEFINES["_FORTIFY_SOURCE"] = "2"
 
2468
 
 
2469
+if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
 
2470
+
 
2471
+    OS_LIBS += [
 
2472
+        "m"
 
2473
+    ]
 
2474
+
 
2475
 if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
 
2476
 
 
2477
     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 
2478
@@ -268,6 +273,39 @@
 
2479
         "-msse2"
 
2480
     ]
 
2481
 
 
2482
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2483
+
 
2484
+    DEFINES["DISABLE_NACL"] = True
 
2485
+    DEFINES["NO_TCMALLOC"] = True
 
2486
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
2487
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2488
+
 
2489
+    OS_LIBS += [
 
2490
+        "m"
 
2491
+    ]
 
2492
+
 
2493
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2494
+
 
2495
+    CXXFLAGS += [
 
2496
+        "-mfpu=neon"
 
2497
+    ]
 
2498
+
 
2499
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
2500
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
2501
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2502
+
 
2503
+if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2504
+
 
2505
+    OS_LIBS += [
 
2506
+        "m"
 
2507
+    ]
 
2508
+
 
2509
+if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2510
+
 
2511
+    OS_LIBS += [
 
2512
+        "m"
 
2513
+    ]
 
2514
+
 
2515
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
2516
 
 
2517
     CXXFLAGS += [
 
2518
--- a/media/webrtc/trunk/webrtc/modules/video_capture/video_capture_module_gn/moz.build
 
2519
+++ b/media/webrtc/trunk/webrtc/modules/video_capture/video_capture_module_gn/moz.build
 
2520
@@ -103,7 +103,6 @@
 
2521
     DEFINES["_FILE_OFFSET_BITS"] = "64"
 
2522
 
 
2523
     OS_LIBS += [
 
2524
-        "m",
 
2525
         "rt"
 
2526
     ]
 
2527
 
 
2528
@@ -176,6 +175,12 @@
 
2529
 
 
2530
     DEFINES["_FORTIFY_SOURCE"] = "2"
 
2531
 
 
2532
+if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
 
2533
+
 
2534
+    OS_LIBS += [
 
2535
+        "m"
 
2536
+    ]
 
2537
+
 
2538
 if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
 
2539
 
 
2540
     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 
2541
@@ -212,6 +217,39 @@
 
2542
         "-msse2"
 
2543
     ]
 
2544
 
 
2545
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2546
+
 
2547
+    DEFINES["DISABLE_NACL"] = True
 
2548
+    DEFINES["NO_TCMALLOC"] = True
 
2549
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
2550
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2551
+
 
2552
+    OS_LIBS += [
 
2553
+        "m"
 
2554
+    ]
 
2555
+
 
2556
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2557
+
 
2558
+    CXXFLAGS += [
 
2559
+        "-mfpu=neon"
 
2560
+    ]
 
2561
+
 
2562
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
2563
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
2564
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2565
+
 
2566
+if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2567
+
 
2568
+    OS_LIBS += [
 
2569
+        "m"
 
2570
+    ]
 
2571
+
 
2572
+if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2573
+
 
2574
+    OS_LIBS += [
 
2575
+        "m"
 
2576
+    ]
 
2577
+
 
2578
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
2579
 
 
2580
     CXXFLAGS += [
 
2581
--- a/media/webrtc/trunk/webrtc/modules/video_coding/video_coding_gn/moz.build
 
2582
+++ b/media/webrtc/trunk/webrtc/modules/video_coding/video_coding_gn/moz.build
 
2583
@@ -131,7 +131,6 @@
 
2584
     DEFINES["_FILE_OFFSET_BITS"] = "64"
 
2585
 
 
2586
     OS_LIBS += [
 
2587
-        "m",
 
2588
         "rt"
 
2589
     ]
 
2590
 
 
2591
@@ -204,6 +203,12 @@
 
2592
 
 
2593
     DEFINES["_FORTIFY_SOURCE"] = "2"
 
2594
 
 
2595
+if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
 
2596
+
 
2597
+    OS_LIBS += [
 
2598
+        "m"
 
2599
+    ]
 
2600
+
 
2601
 if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
 
2602
 
 
2603
     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 
2604
@@ -240,6 +245,39 @@
 
2605
         "-msse2"
 
2606
     ]
 
2607
 
 
2608
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2609
+
 
2610
+    DEFINES["DISABLE_NACL"] = True
 
2611
+    DEFINES["NO_TCMALLOC"] = True
 
2612
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
2613
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2614
+
 
2615
+    OS_LIBS += [
 
2616
+        "m"
 
2617
+    ]
 
2618
+
 
2619
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2620
+
 
2621
+    CXXFLAGS += [
 
2622
+        "-mfpu=neon"
 
2623
+    ]
 
2624
+
 
2625
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
2626
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
2627
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2628
+
 
2629
+if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2630
+
 
2631
+    OS_LIBS += [
 
2632
+        "m"
 
2633
+    ]
 
2634
+
 
2635
+if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2636
+
 
2637
+    OS_LIBS += [
 
2638
+        "m"
 
2639
+    ]
 
2640
+
 
2641
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
2642
 
 
2643
     CXXFLAGS += [
 
2644
--- a/media/webrtc/trunk/webrtc/modules/video_coding/video_coding_utility_gn/moz.build
 
2645
+++ b/media/webrtc/trunk/webrtc/modules/video_coding/video_coding_utility_gn/moz.build
 
2646
@@ -216,6 +216,23 @@
 
2647
         "-msse2"
 
2648
     ]
 
2649
 
 
2650
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2651
+
 
2652
+    DEFINES["DISABLE_NACL"] = True
 
2653
+    DEFINES["NO_TCMALLOC"] = True
 
2654
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
2655
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2656
+
 
2657
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2658
+
 
2659
+    CXXFLAGS += [
 
2660
+        "-mfpu=neon"
 
2661
+    ]
 
2662
+
 
2663
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
2664
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
2665
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2666
+
 
2667
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
2668
 
 
2669
     CXXFLAGS += [
 
2670
--- a/media/webrtc/trunk/webrtc/modules/video_coding/webrtc_h264_gn/moz.build
 
2671
+++ b/media/webrtc/trunk/webrtc/modules/video_coding/webrtc_h264_gn/moz.build
 
2672
@@ -207,6 +207,23 @@
 
2673
         "-msse2"
 
2674
     ]
 
2675
 
 
2676
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2677
+
 
2678
+    DEFINES["DISABLE_NACL"] = True
 
2679
+    DEFINES["NO_TCMALLOC"] = True
 
2680
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
2681
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2682
+
 
2683
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2684
+
 
2685
+    CXXFLAGS += [
 
2686
+        "-mfpu=neon"
 
2687
+    ]
 
2688
+
 
2689
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
2690
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
2691
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2692
+
 
2693
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
2694
 
 
2695
     CXXFLAGS += [
 
2696
--- a/media/webrtc/trunk/webrtc/modules/video_coding/webrtc_i420_gn/moz.build
 
2697
+++ b/media/webrtc/trunk/webrtc/modules/video_coding/webrtc_i420_gn/moz.build
 
2698
@@ -209,6 +209,23 @@
 
2699
         "-msse2"
 
2700
     ]
 
2701
 
 
2702
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2703
+
 
2704
+    DEFINES["DISABLE_NACL"] = True
 
2705
+    DEFINES["NO_TCMALLOC"] = True
 
2706
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
2707
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2708
+
 
2709
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2710
+
 
2711
+    CXXFLAGS += [
 
2712
+        "-mfpu=neon"
 
2713
+    ]
 
2714
+
 
2715
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
2716
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
2717
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2718
+
 
2719
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
2720
 
 
2721
     CXXFLAGS += [
 
2722
--- a/media/webrtc/trunk/webrtc/modules/video_coding/webrtc_vp8_gn/moz.build
 
2723
+++ b/media/webrtc/trunk/webrtc/modules/video_coding/webrtc_vp8_gn/moz.build
 
2724
@@ -215,6 +215,23 @@
 
2725
         "-msse2"
 
2726
     ]
 
2727
 
 
2728
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2729
+
 
2730
+    DEFINES["DISABLE_NACL"] = True
 
2731
+    DEFINES["NO_TCMALLOC"] = True
 
2732
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
2733
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2734
+
 
2735
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2736
+
 
2737
+    CXXFLAGS += [
 
2738
+        "-mfpu=neon"
 
2739
+    ]
 
2740
+
 
2741
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
2742
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
2743
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2744
+
 
2745
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
2746
 
 
2747
     CXXFLAGS += [
 
2748
--- a/media/webrtc/trunk/webrtc/modules/video_coding/webrtc_vp9_gn/moz.build
 
2749
+++ b/media/webrtc/trunk/webrtc/modules/video_coding/webrtc_vp9_gn/moz.build
 
2750
@@ -211,6 +211,23 @@
 
2751
         "-msse2"
 
2752
     ]
 
2753
 
 
2754
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2755
+
 
2756
+    DEFINES["DISABLE_NACL"] = True
 
2757
+    DEFINES["NO_TCMALLOC"] = True
 
2758
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
2759
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2760
+
 
2761
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2762
+
 
2763
+    CXXFLAGS += [
 
2764
+        "-mfpu=neon"
 
2765
+    ]
 
2766
+
 
2767
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
2768
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
2769
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2770
+
 
2771
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
2772
 
 
2773
     CXXFLAGS += [
 
2774
--- a/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_gn/moz.build
 
2775
+++ b/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_gn/moz.build
 
2776
@@ -109,7 +109,6 @@
 
2777
     DEFINES["_FILE_OFFSET_BITS"] = "64"
 
2778
 
 
2779
     OS_LIBS += [
 
2780
-        "m",
 
2781
         "rt"
 
2782
     ]
 
2783
 
 
2784
@@ -182,6 +181,12 @@
 
2785
 
 
2786
     DEFINES["_FORTIFY_SOURCE"] = "2"
 
2787
 
 
2788
+if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
 
2789
+
 
2790
+    OS_LIBS += [
 
2791
+        "m"
 
2792
+    ]
 
2793
+
 
2794
 if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
 
2795
 
 
2796
     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 
2797
@@ -218,6 +223,39 @@
 
2798
         "-msse2"
 
2799
     ]
 
2800
 
 
2801
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2802
+
 
2803
+    DEFINES["DISABLE_NACL"] = True
 
2804
+    DEFINES["NO_TCMALLOC"] = True
 
2805
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
2806
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2807
+
 
2808
+    OS_LIBS += [
 
2809
+        "m"
 
2810
+    ]
 
2811
+
 
2812
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2813
+
 
2814
+    CXXFLAGS += [
 
2815
+        "-mfpu=neon"
 
2816
+    ]
 
2817
+
 
2818
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
2819
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
2820
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2821
+
 
2822
+if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2823
+
 
2824
+    OS_LIBS += [
 
2825
+        "m"
 
2826
+    ]
 
2827
+
 
2828
+if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2829
+
 
2830
+    OS_LIBS += [
 
2831
+        "m"
 
2832
+    ]
 
2833
+
 
2834
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
2835
 
 
2836
     CXXFLAGS += [
 
2837
--- a/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_neon_gn/moz.build
 
2838
+++ b/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_neon_gn/moz.build
 
2839
@@ -38,7 +38,6 @@
 
2840
     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
 
2841
     DEFINES["NDEBUG"] = True
 
2842
     DEFINES["NVALGRIND"] = True
 
2843
-    DEFINES["_FORTIFY_SOURCE"] = "2"
 
2844
 
 
2845
 if CONFIG["MOZ_DEBUG"] == "1":
 
2846
 
 
2847
@@ -64,6 +63,20 @@
 
2848
     DEFINES["WEBRTC_ARCH_ARM64"] = True
 
2849
     DEFINES["WEBRTC_BSD"] = True
 
2850
 
 
2851
+if CONFIG["OS_TARGET"] == "Linux":
 
2852
+
 
2853
+    DEFINES["USE_NSS_CERTS"] = "1"
 
2854
+    DEFINES["USE_X11"] = "1"
 
2855
+    DEFINES["WEBRTC_LINUX"] = True
 
2856
+
 
2857
+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
 
2858
+
 
2859
+    DEFINES["_FORTIFY_SOURCE"] = "2"
 
2860
+
 
2861
+if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "FreeBSD":
 
2862
+
 
2863
+    DEFINES["_FORTIFY_SOURCE"] = "2"
 
2864
+
 
2865
 if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Android":
 
2866
 
 
2867
     DEFINES["WEBRTC_ARCH_ARM64"] = True
 
2868
@@ -72,6 +85,21 @@
 
2869
 
 
2870
     CXXFLAGS += [
 
2871
         "-mfpu=neon"
 
2872
+    ]
 
2873
+
 
2874
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
2875
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
2876
+
 
2877
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2878
+
 
2879
+    DEFINES["DISABLE_NACL"] = True
 
2880
+    DEFINES["NO_TCMALLOC"] = True
 
2881
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
2882
+
 
2883
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2884
+
 
2885
+    CXXFLAGS += [
 
2886
+        "-mfpu=neon"
 
2887
     ]
 
2888
 
 
2889
     DEFINES["WEBRTC_ARCH_ARM"] = True
 
2890
--- a/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn/moz.build
 
2891
+++ b/media/webrtc/trunk/webrtc/modules/video_processing/video_processing_sse2_gn/moz.build
 
2892
@@ -118,6 +118,7 @@
 
2893
 if CONFIG["OS_TARGET"] == "NetBSD":
 
2894
 
 
2895
     CXXFLAGS += [
 
2896
+        "-msse2",
 
2897
         "-msse2"
 
2898
     ]
 
2899
 
 
2900
@@ -129,6 +130,7 @@
 
2901
 if CONFIG["OS_TARGET"] == "OpenBSD":
 
2902
 
 
2903
     CXXFLAGS += [
 
2904
+        "-msse2",
 
2905
         "-msse2"
 
2906
     ]
 
2907
 
 
2908
--- a/media/webrtc/trunk/webrtc/system_wrappers/field_trial_default_gn/moz.build
 
2909
+++ b/media/webrtc/trunk/webrtc/system_wrappers/field_trial_default_gn/moz.build
 
2910
@@ -185,6 +185,23 @@
 
2911
         "-msse2"
 
2912
     ]
 
2913
 
 
2914
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2915
+
 
2916
+    DEFINES["DISABLE_NACL"] = True
 
2917
+    DEFINES["NO_TCMALLOC"] = True
 
2918
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
2919
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2920
+
 
2921
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2922
+
 
2923
+    CXXFLAGS += [
 
2924
+        "-mfpu=neon"
 
2925
+    ]
 
2926
+
 
2927
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
2928
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
2929
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2930
+
 
2931
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
2932
 
 
2933
     CXXFLAGS += [
 
2934
--- a/media/webrtc/trunk/webrtc/system_wrappers/metrics_default_gn/moz.build
 
2935
+++ b/media/webrtc/trunk/webrtc/system_wrappers/metrics_default_gn/moz.build
 
2936
@@ -185,6 +185,23 @@
 
2937
         "-msse2"
 
2938
     ]
 
2939
 
 
2940
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2941
+
 
2942
+    DEFINES["DISABLE_NACL"] = True
 
2943
+    DEFINES["NO_TCMALLOC"] = True
 
2944
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
2945
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2946
+
 
2947
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2948
+
 
2949
+    CXXFLAGS += [
 
2950
+        "-mfpu=neon"
 
2951
+    ]
 
2952
+
 
2953
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
2954
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
2955
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2956
+
 
2957
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
2958
 
 
2959
     CXXFLAGS += [
 
2960
--- a/media/webrtc/trunk/webrtc/system_wrappers/system_wrappers_gn/moz.build
 
2961
+++ b/media/webrtc/trunk/webrtc/system_wrappers/system_wrappers_gn/moz.build
 
2962
@@ -280,6 +280,23 @@
 
2963
         "-msse2"
 
2964
     ]
 
2965
 
 
2966
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2967
+
 
2968
+    DEFINES["DISABLE_NACL"] = True
 
2969
+    DEFINES["NO_TCMALLOC"] = True
 
2970
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
2971
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2972
+
 
2973
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2974
+
 
2975
+    CXXFLAGS += [
 
2976
+        "-mfpu=neon"
 
2977
+    ]
 
2978
+
 
2979
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
2980
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
2981
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2982
+
 
2983
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
2984
 
 
2985
     CXXFLAGS += [
 
2986
--- a/media/webrtc/trunk/webrtc/video/video_gn/moz.build
 
2987
+++ b/media/webrtc/trunk/webrtc/video/video_gn/moz.build
 
2988
@@ -233,6 +233,23 @@
 
2989
         "-msse2"
 
2990
     ]
 
2991
 
 
2992
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
2993
+
 
2994
+    DEFINES["DISABLE_NACL"] = True
 
2995
+    DEFINES["NO_TCMALLOC"] = True
 
2996
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
2997
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
2998
+
 
2999
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
3000
+
 
3001
+    CXXFLAGS += [
 
3002
+        "-mfpu=neon"
 
3003
+    ]
 
3004
+
 
3005
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
3006
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
3007
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
3008
+
 
3009
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
3010
 
 
3011
     CXXFLAGS += [
 
3012
--- a/media/webrtc/trunk/webrtc/video_engine/video_engine_gn/moz.build
 
3013
+++ b/media/webrtc/trunk/webrtc/video_engine/video_engine_gn/moz.build
 
3014
@@ -145,6 +145,23 @@
 
3015
         "-msse2"
 
3016
     ]
 
3017
 
 
3018
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
3019
+
 
3020
+    DEFINES["DISABLE_NACL"] = True
 
3021
+    DEFINES["NO_TCMALLOC"] = True
 
3022
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
3023
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
3024
+
 
3025
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
3026
+
 
3027
+    CXXFLAGS += [
 
3028
+        "-mfpu=neon"
 
3029
+    ]
 
3030
+
 
3031
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
3032
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
3033
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
3034
+
 
3035
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
3036
 
 
3037
     CXXFLAGS += [
 
3038
--- a/media/webrtc/trunk/webrtc/voice_engine/audio_coder_gn/moz.build
 
3039
+++ b/media/webrtc/trunk/webrtc/voice_engine/audio_coder_gn/moz.build
 
3040
@@ -93,7 +93,6 @@
 
3041
     DEFINES["_FILE_OFFSET_BITS"] = "64"
 
3042
 
 
3043
     OS_LIBS += [
 
3044
-        "m",
 
3045
         "rt"
 
3046
     ]
 
3047
 
 
3048
@@ -164,6 +163,12 @@
 
3049
 
 
3050
     DEFINES["_FORTIFY_SOURCE"] = "2"
 
3051
 
 
3052
+if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
 
3053
+
 
3054
+    OS_LIBS += [
 
3055
+        "m"
 
3056
+    ]
 
3057
+
 
3058
 if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
 
3059
 
 
3060
     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 
3061
@@ -200,6 +205,39 @@
 
3062
         "-msse2"
 
3063
     ]
 
3064
 
 
3065
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
3066
+
 
3067
+    DEFINES["DISABLE_NACL"] = True
 
3068
+    DEFINES["NO_TCMALLOC"] = True
 
3069
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
3070
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
3071
+
 
3072
+    OS_LIBS += [
 
3073
+        "m"
 
3074
+    ]
 
3075
+
 
3076
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
3077
+
 
3078
+    CXXFLAGS += [
 
3079
+        "-mfpu=neon"
 
3080
+    ]
 
3081
+
 
3082
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
3083
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
3084
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
3085
+
 
3086
+if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
3087
+
 
3088
+    OS_LIBS += [
 
3089
+        "m"
 
3090
+    ]
 
3091
+
 
3092
+if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
3093
+
 
3094
+    OS_LIBS += [
 
3095
+        "m"
 
3096
+    ]
 
3097
+
 
3098
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
3099
 
 
3100
     CXXFLAGS += [
 
3101
--- a/media/webrtc/trunk/webrtc/voice_engine/file_player_gn/moz.build
 
3102
+++ b/media/webrtc/trunk/webrtc/voice_engine/file_player_gn/moz.build
 
3103
@@ -94,7 +94,6 @@
 
3104
     DEFINES["_FILE_OFFSET_BITS"] = "64"
 
3105
 
 
3106
     OS_LIBS += [
 
3107
-        "m",
 
3108
         "rt"
 
3109
     ]
 
3110
 
 
3111
@@ -165,6 +164,12 @@
 
3112
 
 
3113
     DEFINES["_FORTIFY_SOURCE"] = "2"
 
3114
 
 
3115
+if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
 
3116
+
 
3117
+    OS_LIBS += [
 
3118
+        "m"
 
3119
+    ]
 
3120
+
 
3121
 if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
 
3122
 
 
3123
     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 
3124
@@ -201,6 +206,39 @@
 
3125
         "-msse2"
 
3126
     ]
 
3127
 
 
3128
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
3129
+
 
3130
+    DEFINES["DISABLE_NACL"] = True
 
3131
+    DEFINES["NO_TCMALLOC"] = True
 
3132
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
3133
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
3134
+
 
3135
+    OS_LIBS += [
 
3136
+        "m"
 
3137
+    ]
 
3138
+
 
3139
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
3140
+
 
3141
+    CXXFLAGS += [
 
3142
+        "-mfpu=neon"
 
3143
+    ]
 
3144
+
 
3145
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
3146
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
3147
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
3148
+
 
3149
+if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
3150
+
 
3151
+    OS_LIBS += [
 
3152
+        "m"
 
3153
+    ]
 
3154
+
 
3155
+if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
3156
+
 
3157
+    OS_LIBS += [
 
3158
+        "m"
 
3159
+    ]
 
3160
+
 
3161
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
3162
 
 
3163
     CXXFLAGS += [
 
3164
--- a/media/webrtc/trunk/webrtc/voice_engine/file_recorder_gn/moz.build
 
3165
+++ b/media/webrtc/trunk/webrtc/voice_engine/file_recorder_gn/moz.build
 
3166
@@ -94,7 +94,6 @@
 
3167
     DEFINES["_FILE_OFFSET_BITS"] = "64"
 
3168
 
 
3169
     OS_LIBS += [
 
3170
-        "m",
 
3171
         "rt"
 
3172
     ]
 
3173
 
 
3174
@@ -165,6 +164,12 @@
 
3175
 
 
3176
     DEFINES["_FORTIFY_SOURCE"] = "2"
 
3177
 
 
3178
+if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
 
3179
+
 
3180
+    OS_LIBS += [
 
3181
+        "m"
 
3182
+    ]
 
3183
+
 
3184
 if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
 
3185
 
 
3186
     DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 
3187
@@ -201,6 +206,39 @@
 
3188
         "-msse2"
 
3189
     ]
 
3190
 
 
3191
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
3192
+
 
3193
+    DEFINES["DISABLE_NACL"] = True
 
3194
+    DEFINES["NO_TCMALLOC"] = True
 
3195
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
3196
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
3197
+
 
3198
+    OS_LIBS += [
 
3199
+        "m"
 
3200
+    ]
 
3201
+
 
3202
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
3203
+
 
3204
+    CXXFLAGS += [
 
3205
+        "-mfpu=neon"
 
3206
+    ]
 
3207
+
 
3208
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
3209
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
3210
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
3211
+
 
3212
+if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
3213
+
 
3214
+    OS_LIBS += [
 
3215
+        "m"
 
3216
+    ]
 
3217
+
 
3218
+if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["HOST_CPU_ARCH"] == "x86_64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
3219
+
 
3220
+    OS_LIBS += [
 
3221
+        "m"
 
3222
+    ]
 
3223
+
 
3224
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
3225
 
 
3226
     CXXFLAGS += [
 
3227
--- a/media/webrtc/trunk/webrtc/voice_engine/level_indicator_gn/moz.build
 
3228
+++ b/media/webrtc/trunk/webrtc/voice_engine/level_indicator_gn/moz.build
 
3229
@@ -200,6 +200,23 @@
 
3230
         "-msse2"
 
3231
     ]
 
3232
 
 
3233
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
3234
+
 
3235
+    DEFINES["DISABLE_NACL"] = True
 
3236
+    DEFINES["NO_TCMALLOC"] = True
 
3237
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
3238
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
3239
+
 
3240
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
3241
+
 
3242
+    CXXFLAGS += [
 
3243
+        "-mfpu=neon"
 
3244
+    ]
 
3245
+
 
3246
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
3247
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
3248
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
3249
+
 
3250
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
3251
 
 
3252
     CXXFLAGS += [
 
3253
--- a/media/webrtc/trunk/webrtc/voice_engine/voice_engine_gn/moz.build
 
3254
+++ b/media/webrtc/trunk/webrtc/voice_engine/voice_engine_gn/moz.build
 
3255
@@ -239,6 +239,23 @@
 
3256
         "-msse2"
 
3257
     ]
 
3258
 
 
3259
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
3260
+
 
3261
+    DEFINES["DISABLE_NACL"] = True
 
3262
+    DEFINES["NO_TCMALLOC"] = True
 
3263
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
3264
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
3265
+
 
3266
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
3267
+
 
3268
+    CXXFLAGS += [
 
3269
+        "-mfpu=neon"
 
3270
+    ]
 
3271
+
 
3272
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
3273
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
3274
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
3275
+
 
3276
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
3277
 
 
3278
     CXXFLAGS += [
 
3279
--- a/media/webrtc/trunk/webrtc/webrtc_common_gn/moz.build
 
3280
+++ b/media/webrtc/trunk/webrtc/webrtc_common_gn/moz.build
 
3281
@@ -186,6 +186,23 @@
 
3282
         "-msse2"
 
3283
     ]
 
3284
 
 
3285
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
3286
+
 
3287
+    DEFINES["DISABLE_NACL"] = True
 
3288
+    DEFINES["NO_TCMALLOC"] = True
 
3289
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
3290
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
3291
+
 
3292
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
3293
+
 
3294
+    CXXFLAGS += [
 
3295
+        "-mfpu=neon"
 
3296
+    ]
 
3297
+
 
3298
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
3299
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
3300
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
3301
+
 
3302
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
3303
 
 
3304
     CXXFLAGS += [
 
3305
--- a/media/webrtc/trunk/webrtc/webrtc_gn/moz.build
 
3306
+++ b/media/webrtc/trunk/webrtc/webrtc_gn/moz.build
 
3307
@@ -290,6 +290,23 @@
 
3308
         "-msse2"
 
3309
     ]
 
3310
 
 
3311
+if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["HOST_CPU_ARCH"] == "aarch64" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
3312
+
 
3313
+    DEFINES["DISABLE_NACL"] = True
 
3314
+    DEFINES["NO_TCMALLOC"] = True
 
3315
+    DEFINES["WEBRTC_ARCH_ARM64"] = True
 
3316
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
3317
+
 
3318
+if CONFIG["CPU_ARCH"] == "arm" and CONFIG["HOST_CPU_ARCH"] == "arm" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
 
3319
+
 
3320
+    CXXFLAGS += [
 
3321
+        "-mfpu=neon"
 
3322
+    ]
 
3323
+
 
3324
+    DEFINES["WEBRTC_ARCH_ARM"] = True
 
3325
+    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 
3326
+    DEFINES["WEBRTC_HAS_NEON"] = True
 
3327
+
 
3328
 if CONFIG["CPU_ARCH"] == "x86" and CONFIG["HOST_CPU_ARCH"] == "x86" and not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "NetBSD":
 
3329
 
 
3330
     CXXFLAGS += [