Bug 1357328 - Remove media/webrtc/signaling/test/moz.build. r=jesup
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 18 Apr 2017 17:37:58 +0900
changeset 353648 ed32ab19afb8c06e18ebb5d905fefd4ce7cb0559
parent 353647 08cfcd3c28c06fda01ddbf4369edd945a604dde9
child 353649 00ab2938b91c8cfbda813b3cef56a5f978384d57
push id89304
push userkwierso@gmail.com
push dateTue, 18 Apr 2017 21:39:03 +0000
treeherdermozilla-inbound@b435cb7ca81e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup
bugs1357328, 1322707, 1316611
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1357328 - Remove media/webrtc/signaling/test/moz.build. r=jesup Its content is a no-op since bug 1322707. The code in the same directory, though, is meant to move to gtests (bug 1316611).
media/webrtc/signaling/test/common.build
media/webrtc/signaling/test/moz.build
toolkit/toolkit.mozbuild
deleted file mode 100644
--- a/media/webrtc/signaling/test/common.build
+++ /dev/null
@@ -1,133 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-if CONFIG['OS_TARGET'] in ('Darwin', 'Android'):
-    DEFINES['GTEST_USE_OWN_TR1_TUPLE'] = 1
-
-for var in ('MOZILLA_EXTERNAL_LINKAGE', 'USE_FAKE_MEDIA_STREAMS', 'USE_FAKE_PCOBSERVER',
-            'NR_SOCKET_IS_VOID_PTR', 'HAVE_STRDUP'):
-    DEFINES[var] = True
-
-LOCAL_INCLUDES += [
-    '!/dist/include/mozilla/dom', # Binding headers (because binding
-                                  # implementations include them).
-    '!/dom/bindings', # Binding implementations (urk).
-    '/dom/media/',
-    '/ipc/chromium/src',
-    '/media/mtransport',
-    '/media/mtransport/test',
-    '/media/mtransport/third_party/nICEr/src/ice',
-    '/media/mtransport/third_party/nICEr/src/net',
-    '/media/mtransport/third_party/nICEr/src/stun',
-    '/media/mtransport/third_party/nrappkit/src/event',
-    '/media/mtransport/third_party/nrappkit/src/log',
-    '/media/mtransport/third_party/nrappkit/src/plugin',
-    '/media/mtransport/third_party/nrappkit/src/port/generic/include',
-    '/media/mtransport/third_party/nrappkit/src/registry',
-    '/media/mtransport/third_party/nrappkit/src/share',
-    '/media/mtransport/third_party/nrappkit/src/stats',
-    '/media/mtransport/third_party/nrappkit/src/util/libekr',
-    '/media/webrtc',
-    '/media/webrtc/signaling/src/common/browser_logging',
-    '/media/webrtc/signaling/src/common/time_profiling',
-    '/media/webrtc/signaling/src/media',
-    '/media/webrtc/signaling/src/media-conduit',
-    '/media/webrtc/signaling/src/mediapipeline',
-    '/media/webrtc/signaling/src/peerconnection',
-    '/media/webrtc/signaling/src/sdp/sipcc',
-    '/media/webrtc/trunk',
-    '/xpcom/base',
-]
-
-if CONFIG['OS_TARGET'] == 'Android':
-    LOCAL_INCLUDES += [
-        '/media/mtransport/third_party/nrappkit/src/port/android/include',
-    ]
-
-if CONFIG['OS_TARGET'] == 'Linux':
-    LOCAL_INCLUDES += [
-        '/media/mtransport/third_party/nrappkit/src/port/linux/include',
-    ]
-
-if CONFIG['OS_TARGET'] == 'Darwin':
-    LOCAL_INCLUDES += [
-        '/media/mtransport/third_party/nrappkit/src/port/darwin/include',
-    ]
-    OS_LIBS += [
-        '-framework AudioToolbox',
-        '-framework AudioUnit',
-        '-framework Carbon',
-        '-framework CoreAudio',
-        '-framework OpenGL',
-        '-framework AVFoundation',
-        '-framework CoreMedia',
-        '-framework QuartzCore',
-        '-framework Security',
-        '-framework SystemConfiguration',
-        '-framework IOKit',
-        '-F%s' % CONFIG['MACOS_PRIVATE_FRAMEWORKS_DIR'],
-        '-framework CoreUI',
-    ]
-
-if CONFIG['OS_TARGET'] in ('DragonFly', 'FreeBSD', 'NetBSD', 'OpenBSD'):
-    LOCAL_INCLUDES += [
-        '/media/mtransport/third_party/nrappkit/src/port/darwin/include',
-    ]
-
-USE_LIBS += [
-    '/media/webrtc/trunk/testing/gtest_gtest/gtest',
-    'chromium_atomics',
-    'gkmedias',
-    'nksrtp_s',
-    'nss',
-    'webrtc',
-    'yuv',
-    'zlib',
-]
-
-if CONFIG['JS_SHARED_LIBRARY']:
-    USE_LIBS += [
-        'js',
-    ]
-
-USE_LIBS += ['mozglue']
-
-OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
-OS_LIBS += CONFIG['REALTIME_LIBS']
-
-if CONFIG['MOZ_ALSA']:
-    OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
-
-if CONFIG['MOZ_SYSTEM_JPEG']:
-    OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
-
-if CONFIG['MOZ_SYSTEM_LIBVPX']:
-    OS_LIBS += CONFIG['MOZ_LIBVPX_LIBS']
-
-if not CONFIG['MOZ_TREE_PIXMAN']:
-    OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2':
-    OS_LIBS += CONFIG['XLIBS']
-    OS_LIBS += CONFIG['MOZ_GTK2_LIBS']
-    OS_LIBS += [
-        'gmodule-2.0',
-        'gthread-2.0',
-    ]
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
-    OS_LIBS += CONFIG['XLIBS']
-    OS_LIBS += CONFIG['MOZ_GTK3_LIBS']
-    USE_LIBS += [
-        'freetype',
-    ]
-
-if CONFIG['OS_TARGET'] in ('Linux', 'DragonFly', 'FreeBSD', 'NetBSD',
-        'OpenBSD'):
-    OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS']
-
-if CONFIG['OS_TARGET'] == 'Darwin':
-    OS_LIBS += CONFIG['TK_LIBS']
deleted file mode 100644
--- a/media/webrtc/signaling/test/moz.build
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# 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':
-    GeckoCppUnitTests([
-    ])
-
-include('/ipc/chromium/chromium-config.mozbuild')
-include('common.build')
-
-USE_LIBS += [
-]
-
-if CONFIG['GNU_CXX']:
-    CXXFLAGS += ['-Wno-error=shadow']
-
-if CONFIG['_MSC_VER']:
-    # This is intended as a temporary workaround to enable warning free building
-    # with VS2015.
-    # reinterpret_cast': conversion from 'DWORD' to 'HANDLE' of greater size
-    CXXFLAGS += ['-wd4312']
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -182,14 +182,13 @@ if CONFIG['ENABLE_TESTS']:
     if CONFIG['MOZ_CRASHREPORTER']:
         DIRS += ['/testing/tools/fileid']
 
     if CONFIG['MOZ_MEMORY']:
         DIRS += ['/memory/gtest']
 
     if CONFIG['MOZ_WEBRTC'] and not CONFIG['MOZ_TASK_TRACER']:
         DIRS += [
-            '/media/webrtc/signaling/test',
             '/media/mtransport/test',
         ]
 
 if CONFIG['FUZZING']:
     DIRS += ['/tools/fuzzing']