Bug 818843 - Part 3: Do not build test cases. r=ted

media/mtransport/test/Makefile.in

@@ -105,6 +105,7 @@ DEFINES += \
 endif
 
 ifneq ($(OS_TARGET),WINNT)
+ifneq (gonk,$(MOZ_WIDGET_TOOLKIT))
 CPP_UNIT_TESTS = \
   ice_unittest.cpp \
   nrappkit_unittest.cpp \
@@ -116,6 +117,7 @@ ifdef MOZ_SCTP
 CPP_UNIT_TESTS += sctp_unittest.cpp
 endif
 
+endif
 endif
 
 include $(topsrcdir)/config/rules.mk

media/webrtc/moz.build

@@ -5,8 +5,11 @@
 
 EXTERNAL_MAKE_DIRS += [
     'trunk',
-    'trunk/testing',
     'signaling',
-    'signalingtest',
 ]
 
+if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
+    EXTERNAL_MAKE_DIRS += [
+        'trunk/testing',
+        'signalingtest',
+    ]

media/webrtc/signaling/test/Makefile.in

@@ -142,6 +142,7 @@ LOCAL_INCLUDES += \
  $(NULL)
 
 ifneq ($(OS_TARGET),WINNT)
+ifneq (gonk,$(MOZ_WIDGET_TOOLKIT))
 ifdef JS_SHARED_LIBRARY
 LIBS += $(MOZ_ZLIB_LIBS)
 endif
@@ -152,6 +153,7 @@ CPP_UNIT_TESTS = \
   mediaconduit_unittests.cpp \
   $(NULL)
 endif
+endif
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/media/webrtc/webrtc-config.mk

toolkit/toolkit.mozbuild

@@ -242,7 +242,7 @@ if CONFIG['ENABLE_TESTS']:
         'testing/modules',
     ])
 
-    if CONFIG['MOZ_WEBRTC']:
+    if CONFIG['MOZ_WEBRTC'] and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
             add_tier_dir('platform', [
                 'media/webrtc/signaling/test',
                 'media/mtransport/test',