From 292d5cf0b558141c5e96da64402b5a8e5158b0ac Mon Sep 17 00:00:00 2001
From: Steven Lee <slee@mozilla.com>
Date: Tue, 19 Mar 2013 16:02:44 -0400
Subject: [PATCH] Bug 818843 - Part 3: Do not build test cases. r=ted

---
 media/mtransport/test/Makefile.in       |  2 ++
 media/webrtc/moz.build                  |  7 +++++--
 media/webrtc/signaling/test/Makefile.in |  2 ++
 toolkit/toolkit.mozbuild                | 10 +++++-----
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/media/mtransport/test/Makefile.in b/media/mtransport/test/Makefile.in
index 8b7f8d8ed00..2c8419740b5 100644
--- a/media/mtransport/test/Makefile.in
+++ b/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
diff --git a/media/webrtc/moz.build b/media/webrtc/moz.build
index c927fcb6f09..7cec24ba72a 100644
--- a/media/webrtc/moz.build
+++ b/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',
+    ]
diff --git a/media/webrtc/signaling/test/Makefile.in b/media/webrtc/signaling/test/Makefile.in
index b483cd1bddd..9955db4caf1 100644
--- a/media/webrtc/signaling/test/Makefile.in
+++ b/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
diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild
index 779a4caf9b8..7daa06edc1c 100644
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -242,8 +242,8 @@ if CONFIG['ENABLE_TESTS']:
         'testing/modules',
     ])
 
-    if CONFIG['MOZ_WEBRTC']:
-        add_tier_dir('platform', [
-            'media/webrtc/signaling/test',
-            'media/mtransport/test',
-        ])
+    if CONFIG['MOZ_WEBRTC'] and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
+            add_tier_dir('platform', [
+                'media/webrtc/signaling/test',
+                'media/mtransport/test',
+            ])