bug 1171120 - Fix mtransport+signalling to build on iOS. r=ekr
authorTed Mielczarek <ted@mielczarek.org>
Fri, 27 Feb 2015 12:37:42 -0500
changeset 279534 4655a27961146c2667bfa6821415da775e684f3a
parent 279533 d832a498605feff06b542b2b95f803adb1f5edcc
child 279535 7cd4ddde77e9743035bbeeca1b71cc59f9e8e960
push id4932
push userjlund@mozilla.com
push dateMon, 10 Aug 2015 18:23:06 +0000
treeherdermozilla-beta@6dd5a4f5f745 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersekr
bugs1171120
milestone41.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 1171120 - Fix mtransport+signalling to build on iOS. r=ekr
media/mtransport/third_party/nICEr/nicer.gyp
media/mtransport/third_party/nICEr/src/util/mbslen.c
media/mtransport/third_party/nrappkit/nrappkit.gyp
media/webrtc/signaling/signaling.gyp
media/webrtc/signaling/src/sdp/sipcc/cpr_types.h
media/webrtc/signaling/test/moz.build
--- a/media/mtransport/third_party/nICEr/nicer.gyp
+++ b/media/mtransport/third_party/nICEr/nicer.gyp
@@ -138,28 +138,27 @@
 	      'R_DEFINED_INT4=int32_t',
 	      'R_DEFINED_UINT4=uint32_t',
 	      'R_DEFINED_INT8=int64_t',
 	      'R_DEFINED_UINT8=uint64_t',
           ],
 
           'conditions' : [
               ## Mac and BSDs
-              [ 'OS == "mac"', {
+              [ 'OS == "mac" or OS == "ios"', {
                 'defines' : [
                     'DARWIN',
-                    'HAVE_XLOCALE',
                 ],
               }],
               [ 'os_bsd == 1', {
                 'defines' : [
                     'BSD',
                 ],
               }],
-              [ 'OS == "mac" or os_bsd == 1', {
+              [ 'OS == "mac" or OS == "ios" or os_bsd == 1', {
                 'cflags_mozilla': [
                     '-Wall',
                     '-Wno-parentheses',
                     '-Wno-strict-prototypes',
                     '-Wmissing-prototypes',
                  ],
                  'defines' : [
                      'HAVE_LIBM=1',
--- a/media/mtransport/third_party/nICEr/src/util/mbslen.c
+++ b/media/mtransport/third_party/nICEr/src/util/mbslen.c
@@ -38,17 +38,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 
 #include <errno.h>
 #include <csi_platform.h>
 
 #include <assert.h>
 #include <locale.h>
 #include <stdlib.h>
 #include <wchar.h>
-#ifdef DARWIN
+#if defined(DARWIN)
 #define HAVE_XLOCALE
 #endif
 
 #ifdef __FreeBSD__
 #include <osreldate.h>
 # if __FreeBSD_version > 900505
 #  define HAVE_XLOCALE
 # endif
--- a/media/mtransport/third_party/nrappkit/nrappkit.gyp
+++ b/media/mtransport/third_party/nrappkit/nrappkit.gyp
@@ -148,17 +148,17 @@
                     'DARWIN',
                 ],
               }],
               [ 'os_bsd == 1', {
                 'defines' : [
                     'BSD',
                 ],
               }],
-              [ 'OS == "mac" or os_bsd == 1', {
+              [ 'OS == "mac" or OS == "ios" or os_bsd == 1', {
                 'cflags_mozilla': [
                     '-Wall',
                     '-Wno-parentheses',
                     '-Wno-strict-prototypes',
                     '-Wmissing-prototypes',
                  ],
                  'defines' : [
                      'HAVE_LIBM=1',
--- a/media/webrtc/signaling/signaling.gyp
+++ b/media/webrtc/signaling/signaling.gyp
@@ -345,17 +345,17 @@
             'SIP_OS_OSX',
             'OSX',
             'SECLIB_OPENSSL',
           ],
 
           'cflags_mozilla': [
           ],
         }],
-        ['OS=="mac"', {
+        ['OS=="mac" or OS=="ios"', {
           'include_dirs': [
           ],
           'defines': [
             'WEBRTC_POSIX',
             'OS_MACOSX',
             'SIP_OS_OSX',
             'OSX',
             '_FORTIFY_SOURCE=2',
--- a/media/webrtc/signaling/src/sdp/sipcc/cpr_types.h
+++ b/media/webrtc/signaling/src/sdp/sipcc/cpr_types.h
@@ -6,16 +6,19 @@
 #define _CPR_TYPES_H_
 
 #if defined SIP_OS_LINUX
 #include "cpr_linux_types.h"
 #elif defined SIP_OS_WINDOWS
 #include "cpr_win_types.h"
 #elif defined SIP_OS_OSX
 #include "cpr_darwin_types.h"
+#else
+//lol
+//#error "Unsupported platform"
 #endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /*
  * CPR Return Codes
--- a/media/webrtc/signaling/test/moz.build
+++ b/media/webrtc/signaling/test/moz.build
@@ -1,15 +1,16 @@
 # -*- 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/.
 
-if CONFIG['OS_TARGET'] != 'WINNT' and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
+# 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([
         'jsep_session_unittest',
         'mediaconduit_unittests',
         'mediapipeline_unittest',
         'sdp_unittests',
         'signaling_unittests',
     ])