Backout c9831bed6bb7 - Bug 818843 - This change broke building B2G on the mac. r=me
authorDoug Turner <dougt@dougt.org>
Mon, 07 Jan 2013 08:48:24 -0800
changeset 123499 8155dd7632bbfe5d8876e9e787936ceab96d92e0
parent 123498 a2c05e82dd8980bf973030f755c32b0563851f40
child 123500 eaf8b4f2eaa59bf3626036b13bee8c6ed9daa671
child 124070 54313af58e7fde38fba5a53ddc468c4d646e3135
push id3129
push userakeybl@mozilla.com
push dateMon, 07 Jan 2013 22:54:45 +0000
treeherdermozilla-aurora@090bc89ff6b4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs818843
milestone20.0a1
backs outc9831bed6bb72997b34d934f79a1bcea75462af5
Backout c9831bed6bb7 - Bug 818843 - This change broke building B2G on the mac. r=me
media/mtransport/test/Makefile.in
media/mtransport/third_party/nICEr/nicer.gyp
media/webrtc/Makefile.in
media/webrtc/signaling/signaling.gyp
media/webrtc/signaling/src/sipcc/cpr/linux/cpr_linux_init.c
media/webrtc/signaling/src/sipcc/cpr/linux/cpr_linux_ipc.c
media/webrtc/signaling/src/sipcc/cpr/linux/cpr_linux_socket.c
media/webrtc/signaling/test/Makefile.in
media/webrtc/trunk/build/common.gypi
media/webrtc/trunk/src/build/arm_neon.gypi
media/webrtc/trunk/src/build/common.gypi
media/webrtc/trunk/src/modules/audio_device/main/source/linux/audio_device_alsa_linux.h
media/webrtc/trunk/src/modules/audio_device/main/source/linux/audio_mixer_manager_alsa_linux.h
media/webrtc/trunk/src/system_wrappers/source/aligned_malloc.cc
media/webrtc/trunk/src/system_wrappers/source/cpu_info.cc
media/webrtc/trunk/src/system_wrappers/source/thread_posix.cc
media/webrtc/trunk/supplement/supplement.gypi
--- a/media/mtransport/test/Makefile.in
+++ b/media/mtransport/test/Makefile.in
@@ -94,24 +94,22 @@ CPPFLAGS += \
   $(STLPORT_CPPFLAGS) \
   $(NULL)
 DEFINES += \
   -DGTEST_USE_OWN_TR1_TUPLE=1 \
   $(NULL)
 endif
 
 ifneq ($(OS_TARGET),WINNT)
-ifneq (gonk,$(MOZ_WIDGET_TOOLKIT))
 CPP_UNIT_TESTS = \
   ice_unittest.cpp \
   nrappkit_unittest.cpp \
   sockettransportservice_unittest.cpp \
   transport_unittests.cpp \
   runnable_utils_unittest.cpp \
   $(NULL)
 ifdef MOZ_SCTP
 CPP_UNIT_TESTS += sctp_unittest.cpp
 endif
 
 endif
-endif
 
 include $(topsrcdir)/config/rules.mk
--- a/media/mtransport/third_party/nICEr/nicer.gyp
+++ b/media/mtransport/third_party/nICEr/nicer.gyp
@@ -199,19 +199,13 @@
                  ],
 
 		 'include_dirs': [
 		     '../nrappkit/src/port/linux/include'
 		 ],
 		 
 		 'sources': [
 		 ],
-              }],
-              ['moz_widget_toolkit_gonk==1', {
-                'defines' : [
-                  'WEBRTC_GONK',
-                  'NO_REG_RPC',
-                ],
-             }],
-          ],
+              }]
+          ]
       }]
 }
 
--- a/media/webrtc/Makefile.in
+++ b/media/webrtc/Makefile.in
@@ -6,21 +6,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DIRS = \
   trunk \
+  trunk/testing \
   signaling \
+  signalingtest \
   $(NULL)
 
-ifneq (gonk,$(MOZ_WIDGET_TOOLKIT))
-DIRS += \
-  signalingtest \
-  trunk/testing \
-	$(NULL)
-endif
-
 # These Makefiles don't have corresponding Makefile.ins
 NO_SUBMAKEFILES_RULE = 1
 include $(topsrcdir)/config/rules.mk
--- a/media/webrtc/signaling/signaling.gyp
+++ b/media/webrtc/signaling/signaling.gyp
@@ -8,25 +8,16 @@
 # sip.gyp - a library for SIP
 #
 
 {
   'variables': {
     'chromium_code': 1,
   },
 
-  'target_defaults': {
-    'conditions': [
-      ['moz_widget_toolkit_gonk==1', {
-        'defines' : [
-          'WEBRTC_GONK',
-       ],
-      }],
-    ],
-  }, 
   'targets': [
 
     #
     # ECC
     #
     {
       'target_name': 'ecc',
       'type': 'static_library',
--- a/media/webrtc/signaling/src/sipcc/cpr/linux/cpr_linux_init.c
+++ b/media/webrtc/signaling/src/sipcc/cpr/linux/cpr_linux_init.c
@@ -112,23 +112,18 @@
 #include "cpr.h"
 #include "cpr_stdlib.h"
 #include "cpr_stdio.h"
 #include "cpr_timers.h"
 #include "cpr_linux_locks.h"
 #include "cpr_linux_timers.h"
 #include "plat_api.h"
 #include <errno.h>
-#if defined(WEBRTC_GONK)
-#include <linux/msg.h>
-#include <linux/ipc.h>
-#else
 #include <sys/msg.h>
 #include <sys/ipc.h>
-#endif
 #include "plat_debug.h"
 
 /**
   * Mutex to manage message queue list.
   */
 extern pthread_mutex_t msgQueueListMutex;
 
 /**
--- a/media/webrtc/signaling/src/sipcc/cpr/linux/cpr_linux_ipc.c
+++ b/media/webrtc/signaling/src/sipcc/cpr/linux/cpr_linux_ipc.c
@@ -31,54 +31,25 @@
  * @{
  *
  *
  */
 #include "cpr.h"
 #include "cpr_stdlib.h"
 #include <cpr_stdio.h>
 #include <errno.h>
-#if defined(WEBRTC_GONK)
-#include <sys/syscall.h>
-#include <unistd.h>
-#include <linux/msg.h>
-#include <linux/ipc.h>
-#else
 #include <sys/msg.h>
 #include <sys/ipc.h>
-#endif
 #include "plat_api.h"
 #include "CSFLog.h"
 
 static const char *logTag = "cpr_linux_ipc";
 
 #define STATIC static
 
-#if defined(WEBRTC_GONK)
-int msgsnd(int msqid, const void *msgp, size_t msgsz, int msgflg)
-{
-  return syscall(__NR_msgsnd, msqid, msgp, msgsz, msgflg);
-}
-
-ssize_t msgrcv(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg)
-{
-  return syscall(__NR_msgrcv, msqid, msgp, msgsz, msgtyp, msgflg);
-}
-
-int msgctl(int msqid, int cmd, struct msqid_ds *buf)
-{
-  return syscall(__NR_msgctl, msqid, cmd, buf);
-}
-
-int msgget(key_t key, int msgflg)
-{
-  return syscall(__NR_msgget, key, msgflg);
-}
-#endif
-
 /* @def The Message Queue depth */
 #define OS_MSGTQL 31
 
 /*
  * Internal CPR API
  */
 extern pthread_t cprGetThreadId(cprThread_t thread);
 
--- a/media/webrtc/signaling/src/sipcc/cpr/linux/cpr_linux_socket.c
+++ b/media/webrtc/signaling/src/sipcc/cpr/linux/cpr_linux_socket.c
@@ -7,23 +7,18 @@
 #include "cpr_assert.h"
 #include "cpr_socket.h"
 #include "cpr_debug.h"
 #include "cpr_rand.h"
 #include "cpr_timers.h"
 #include "cpr_errno.h"
 #include "cpr_stdlib.h"
 #include "cpr_string.h"
-#if defined(WEBRTC_GONK)
-#include <syslog.h>
-#include <linux/fcntl.h>
-#else
 #include <sys/syslog.h>
 #include <sys/fcntl.h>
-#endif
 #include <ctype.h>
 
 
 //const cpr_in6_addr_t in6addr_any = IN6ADDR_ANY_INIT;
 const cpr_ip_addr_t ip_addr_invalid = {0};
 
 #define IN6ADDRSZ   16
 #define INT16SZ     2
--- a/media/webrtc/signaling/test/Makefile.in
+++ b/media/webrtc/signaling/test/Makefile.in
@@ -131,25 +131,23 @@ LOCAL_INCLUDES += \
  -I$(topsrcdir)/media/webrtc/signaling/src/mediapipeline \
  -I$(topsrcdir)/media/webrtc/signaling/src/sipcc/include \
  -I$(topsrcdir)/media/webrtc/signaling/src/peerconnection \
  -I$(topsrcdir)/media/webrtc/signaling/media-conduit\
  -I$(topsrcdir)/media/webrtc/trunk/third_party/libjingle/source/ \
  $(NULL)
 
 ifneq ($(OS_TARGET),WINNT)
-ifneq (gonk,$(MOZ_WIDGET_TOOLKIT))
 ifdef JS_SHARED_LIBRARY
 LIBS += $(MOZ_ZLIB_LIBS)
 endif
 
 CPP_UNIT_TESTS = \
   signaling_unittests.cpp \
   mediapipeline_unittest.cpp \
   mediaconduit_unittests.cpp \
   $(NULL)
 endif
-endif
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/media/webrtc/webrtc-config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
--- a/media/webrtc/trunk/build/common.gypi
+++ b/media/webrtc/trunk/build/common.gypi
@@ -870,23 +870,16 @@
 
     'sas_dll_exists': '<!(python <(DEPTH)/build/dir_exists.py <(sas_dll_path))',
     'wix_exists': '<!(python <(DEPTH)/build/dir_exists.py <(wix_path))',
 
     'windows_sdk_default_path': '<(DEPTH)/third_party/platformsdk_win8/files',
     'directx_sdk_default_path': '<(DEPTH)/third_party/directxsdk/files',
 
     'conditions': [
-      ['moz_widget_toolkit_gonk==1', {
-        'variables': {
-          'disable_sse2': 1,
-        },
-      }],
-    ],
-    'conditions': [
       ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(windows_sdk_default_path))"=="True"', {
         'windows_sdk_path%': '<(windows_sdk_default_path)',
       }, {
         'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.0',
       }],
       ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(directx_sdk_default_path))"=="True"', {
         'directx_sdk_path%': '<(directx_sdk_default_path)',
       }, {
--- a/media/webrtc/trunk/src/build/arm_neon.gypi
+++ b/media/webrtc/trunk/src/build/arm_neon.gypi
@@ -16,17 +16,17 @@
 #     'foo.c',
 #     'bar.cc',
 #   ],
 #   'includes': ['path/to/this/gypi/file'],
 # }
 
 {
   'conditions': [
-    ['OS=="android" or moz_widget_toolkit_gonk==1', {
+    ['OS=="android"', {
       'cflags!': [
         '-mfpu=vfpv3-d16',
       ],
       'cflags_mozilla!': [
         '-mfpu=vfpv3-d16',
       ],
       'cflags': [
         '-mfpu=neon',
--- a/media/webrtc/trunk/src/build/common.gypi
+++ b/media/webrtc/trunk/src/build/common.gypi
@@ -115,22 +115,16 @@
     ],
     'defines': [
       # TODO(leozwang): Run this as a gclient hook rather than at build-time:
       # http://code.google.com/p/webrtc/issues/detail?id=687
       'WEBRTC_SVNREVISION="\\\"Unavailable(issue687)\\\""',
       #'WEBRTC_SVNREVISION="<!(python <(webrtc_root)/build/version.py)"',
     ],
     'conditions': [
-      ['moz_widget_toolkit_gonk==1', {
-        'defines' : [
-          'WEBRTC_GONK',
-        ],
-      }],
-  
       ['build_with_chromium==1', {
         'defines': [
           # Changes settings for Chromium build.
           'WEBRTC_CHROMIUM_BUILD',
         ],
       }, {
         'conditions': [
           ['os_posix==1', {
@@ -174,23 +168,16 @@
                   'WEBRTC_DETECT_ARM_NEON',
                 ],
               }],
             ],
           }],
         ],
       }],
       ['OS=="linux"', {
-        'conditions': [
-          ['moz_have_clock_monotonic==1', {
-            'defines': [
-              'WEBRTC_CLOCK_TYPE_REALTIME',
-            ],
-          }],
-        ],
         'defines': [
           'WEBRTC_LINUX',
           'WEBRTC_THREAD_RR',
           # TODO(andrew): can we select this automatically?
           # Define this if the Linux system does not support CLOCK_MONOTONIC.
           #'WEBRTC_CLOCK_TYPE_REALTIME',
         ],
       }],
--- a/media/webrtc/trunk/src/modules/audio_device/main/source/linux/audio_device_alsa_linux.h
+++ b/media/webrtc/trunk/src/modules/audio_device/main/source/linux/audio_device_alsa_linux.h
@@ -10,25 +10,20 @@
 
 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_ALSA_LINUX_H
 #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_ALSA_LINUX_H
 
 #include "audio_device_generic.h"
 #include "critical_section_wrapper.h"
 #include "audio_mixer_manager_alsa_linux.h"
 
+#include <sys/soundcard.h>
 #include <sys/ioctl.h>
 
-#if defined (WEBRTC_GONK)
-#include <linux/soundcard.h>
-#include <tinyalsa/asoundlib.h>
-#else
-#include <sys/soundcard.h>
 #include <alsa/asoundlib.h>
-#endif
 
 namespace webrtc
 {
 class EventWrapper;
 class ThreadWrapper;
 
 class AudioDeviceLinuxALSA : public AudioDeviceGeneric
 {
--- a/media/webrtc/trunk/src/modules/audio_device/main/source/linux/audio_mixer_manager_alsa_linux.h
+++ b/media/webrtc/trunk/src/modules/audio_device/main/source/linux/audio_mixer_manager_alsa_linux.h
@@ -11,21 +11,17 @@
 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_ALSA_LINUX_H
 #define WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_ALSA_LINUX_H
 
 #include "typedefs.h"
 #include "audio_device.h"
 #include "critical_section_wrapper.h"
 #include "alsasymboltable_linux.h"
 
-#if defined (WEBRTC_GONK)
-#include <tinyalsa/asoundlib.h>
-#else
 #include <alsa/asoundlib.h>
-#endif
 
 namespace webrtc
 {
 
 class AudioMixerManagerLinuxALSA
 {
 public:
     WebRtc_Word32 OpenSpeaker(char* deviceName);
--- a/media/webrtc/trunk/src/system_wrappers/source/aligned_malloc.cc
+++ b/media/webrtc/trunk/src/system_wrappers/source/aligned_malloc.cc
@@ -24,20 +24,16 @@
 #endif
 
 #if _WIN32
     #include <windows.h>
 #else
     #include <stdint.h>
 #endif
 
-#ifdef WEBRTC_GONK
-#include <string.h>
-#endif
-
 #include "typedefs.h"
 
 // Ok reference on memory alignment:
 // http://stackoverflow.com/questions/227897/solve-the-memory-alignment-in-c-interview-question-that-stumped-me
 
 namespace webrtc
 {
 // TODO (hellner) better to create just one memory block and
--- a/media/webrtc/trunk/src/system_wrappers/source/cpu_info.cc
+++ b/media/webrtc/trunk/src/system_wrappers/source/cpu_info.cc
@@ -35,17 +35,17 @@ WebRtc_UWord32 CpuInfo::DetectNumberOfCo
     {
 #if defined(_WIN32)
         SYSTEM_INFO si;
         GetSystemInfo(&si);
         _numberOfCores = static_cast<WebRtc_UWord32>(si.dwNumberOfProcessors);
         WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1,
                      "Available number of cores:%d", _numberOfCores);
 
-#elif defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_GONK)
+#elif defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID)
         _numberOfCores = get_nprocs();
         WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1,
                      "Available number of cores:%d", _numberOfCores);
 
 #elif (defined(WEBRTC_MAC) || defined(WEBRTC_MAC_INTEL))
         int name[] = {CTL_HW, HW_AVAILCPU};
         int ncpu;
         size_t size = sizeof(ncpu);
--- a/media/webrtc/trunk/src/system_wrappers/source/thread_posix.cc
+++ b/media/webrtc/trunk/src/system_wrappers/source/thread_posix.cc
@@ -124,17 +124,17 @@ uint32_t ThreadWrapper::GetThreadId() {
 #else
   return reinterpret_cast<uint32_t>(pthread_self());
 #endif
 }
 
 int ThreadPosix::Construct()
 {
     int result = 0;
-#if !defined(WEBRTC_ANDROID) && !defined(WEBRTC_GONK)
+#if !defined(WEBRTC_ANDROID)
     // Enable immediate cancellation if requested, see Shutdown()
     result = pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
     if (result != 0)
     {
         return -1;
     }
     result = pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
     if (result != 0)
@@ -279,17 +279,17 @@ bool ThreadPosix::SetAffinity(const int*
 void ThreadPosix::SetNotAlive()
 {
     CriticalSectionScoped cs(_crit_state);
     _alive = false;
 }
 
 bool ThreadPosix::Shutdown()
 {
-#if !defined(WEBRTC_ANDROID) && !defined(WEBRTC_GONK)
+#if !defined(WEBRTC_ANDROID)
     if (_thread && (0 != pthread_cancel(_thread)))
     {
         return false;
     }
 
     return true;
 #else
     return false;
--- a/media/webrtc/trunk/supplement/supplement.gypi
+++ b/media/webrtc/trunk/supplement/supplement.gypi
@@ -3,15 +3,10 @@
   'variables': {
     'build_with_chromium': 0,
     'enable_protobuf': 0,
     'enabled_libjingle_device_manager': 1,
     'include_internal_audio_device': 1,
     'include_internal_video_capture': 1,
     'include_internal_video_render': 0,
     'include_pulse_audio': 0,
-    'conditions': [
-      ['moz_widget_toolkit_gonk==1', {
-        'include_internal_audio_device': 0,
-      }],
-    ],
-  },
+  }
 }