summaryrefslogtreecommitdiffstats
path: root/media/webrtc
diff options
context:
space:
mode:
Diffstat (limited to 'media/webrtc')
-rw-r--r--media/webrtc/moz.build35
-rw-r--r--media/webrtc/signaling/test/moz.build2
2 files changed, 18 insertions, 19 deletions
diff --git a/media/webrtc/moz.build b/media/webrtc/moz.build
index 986655c53..4361273b4 100644
--- a/media/webrtc/moz.build
+++ b/media/webrtc/moz.build
@@ -101,22 +101,21 @@ if CONFIG['MOZ_WEBRTC_SIGNALING']:
else:
CXXFLAGS += ['-validate-charset-']
-if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
- GYP_DIRS += ['trunk/testing']
- GYP_DIRS['trunk/testing'].input = 'trunk/testing/gtest.gyp'
- GYP_DIRS['trunk/testing'].variables = gyp_vars
- # We allow warnings for third-party code that can be updated from upstream.
- GYP_DIRS['trunk/testing'].sandbox_vars['ALLOW_COMPILER_WARNINGS'] = True
- GYP_DIRS['trunk/testing'].non_unified_sources += webrtc_non_unified_sources
+GYP_DIRS += ['trunk/testing']
+GYP_DIRS['trunk/testing'].input = 'trunk/testing/gtest.gyp'
+GYP_DIRS['trunk/testing'].variables = gyp_vars
+# We allow warnings for third-party code that can be updated from upstream.
+GYP_DIRS['trunk/testing'].sandbox_vars['ALLOW_COMPILER_WARNINGS'] = True
+GYP_DIRS['trunk/testing'].non_unified_sources += webrtc_non_unified_sources
- if CONFIG['MOZ_WEBRTC_SIGNALING']:
- GYP_DIRS += ['signalingtest']
- GYP_DIRS['signalingtest'].input = 'signaling/signaling.gyp'
- GYP_DIRS['signalingtest'].variables = gyp_vars.copy()
- GYP_DIRS['signalingtest'].variables.update(
- build_for_test=1,
- moz_webrtc_mediacodec=0,
- build_for_standalone=0
- )
- GYP_DIRS['signalingtest'].sandbox_vars['ALLOW_COMPILER_WARNINGS'] = True
- GYP_DIRS['signalingtest'].non_unified_sources += signaling_non_unified_sources
+if CONFIG['MOZ_WEBRTC_SIGNALING']:
+ GYP_DIRS += ['signalingtest']
+ GYP_DIRS['signalingtest'].input = 'signaling/signaling.gyp'
+ GYP_DIRS['signalingtest'].variables = gyp_vars.copy()
+ GYP_DIRS['signalingtest'].variables.update(
+ build_for_test=1,
+ moz_webrtc_mediacodec=0,
+ build_for_standalone=0
+ )
+ GYP_DIRS['signalingtest'].sandbox_vars['ALLOW_COMPILER_WARNINGS'] = True
+ GYP_DIRS['signalingtest'].non_unified_sources += signaling_non_unified_sources
diff --git a/media/webrtc/signaling/test/moz.build b/media/webrtc/signaling/test/moz.build
index 4d8704de4..aac331b1b 100644
--- a/media/webrtc/signaling/test/moz.build
+++ b/media/webrtc/signaling/test/moz.build
@@ -5,7 +5,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
# TODO: bug 1172551 - get these tests working on iOS
-if CONFIG['OS_TARGET'] != 'WINNT' and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk' and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'uikit':
+if CONFIG['OS_TARGET'] != 'WINNT' and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'uikit':
GeckoCppUnitTests([
'jsep_session_unittest',
'jsep_track_unittest',