Bug 1257888 - Link chromium mutex-based atomics implementation to webrtc signaling tests. r=froydnj
authorMike Hommey <mh@glandium.org>
Sat, 19 Mar 2016 01:24:21 +0900
changeset 290999 e534484bb762eae6c8242322ae3b79be18759d6e
parent 290998 cdb91f4483be1538ca4f1f1acad352aff8a5690b
child 291000 57a5ea9600319dba3b60f7df33945e9e1fc347de
push id19656
push usergwagner@mozilla.com
push dateMon, 04 Apr 2016 13:43:23 +0000
treeherderb2g-inbound@e99061fde28a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1257888
milestone48.0a1
Bug 1257888 - Link chromium mutex-based atomics implementation to webrtc signaling tests. r=froydnj
ipc/chromium/atomics/moz.build
ipc/chromium/moz.build
media/webrtc/signaling/test/common.build
new file mode 100644
--- /dev/null
+++ b/ipc/chromium/atomics/moz.build
@@ -0,0 +1,17 @@
+# -*- Mode: python; c-basic-offset: 4; 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/.
+
+include('/ipc/chromium/chromium-config.mozbuild')
+
+Library('chromium_atomics')
+
+# This test is copied from ../moz.build for atomicops_internals_mutex.cc
+ost = CONFIG['OS_TEST']
+if '86' not in ost and 'arm' not in ost and 'aarch64' != ost and 'mips' not in ost:
+    SOURCES += [
+        '../src/base/atomicops_internals_mutex.cc',
+        '../src/base/lock_impl_posix.cc',
+    ]
--- a/ipc/chromium/moz.build
+++ b/ipc/chromium/moz.build
@@ -160,8 +160,12 @@ if '86' not in ost and 'arm' not in ost 
         'src/base/atomicops_internals_mutex.cc',
     ]
 
 CXXFLAGS += CONFIG['TK_CFLAGS']
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
+
+DIRS += [
+    'atomics',
+]
--- a/media/webrtc/signaling/test/common.build
+++ b/media/webrtc/signaling/test/common.build
@@ -74,16 +74,17 @@ if CONFIG['OS_TARGET'] == 'Darwin':
 
 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',
 ]