Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backout c9831bed6bb7 - Bug 818843 - This change broke building B2G on the mac. r=me

Browse Source 
--HG--
extra : rebase_source : 7bef8dc1c394d45302f17379ab2cbd90ecda6975
This commit is contained in:
Doug Turner 2013-01-07 08:48:24 -08:00
parent e0776283c1
commit a9eb151cf8
17 changed files with 11 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
media/mtransport/test/Makefile.in
View File

@ -99,7 +99,6 @@ DEFINES += \
endif
ifneq ($(OS_TARGET),WINNT)
ifneq (gonk,$(MOZ_WIDGET_TOOLKIT))
CPP_UNIT_TESTS = \
ice_unittest.cpp \
nrappkit_unittest.cpp \
@ -111,7 +110,6 @@ ifdef MOZ_SCTP
CPP_UNIT_TESTS += sctp_unittest.cpp
endif
endif
endif
include $(topsrcdir)/config/rules.mk

10
media/mtransport/third_party/nICEr/nicer.gyp vendored
View File

@ -204,14 +204,8 @@
'sources': [
],
}],
['moz_widget_toolkit_gonk==1', {
'defines' : [
'WEBRTC_GONK',
'NO_REG_RPC',
],
}],
],
}]
]
}]
}

11
media/webrtc/Makefile.in
View File

@ -11,15 +11,10 @@ include $(DEPTH)/config/autoconf.mk
DIRS = \
trunk \
signaling \
$(NULL)
ifneq (gonk,$(MOZ_WIDGET_TOOLKIT))
DIRS += \
signalingtest \
trunk/testing \
$(NULL)
endif
signaling \
signalingtest \
$(NULL)
# These Makefiles don't have corresponding Makefile.ins
NO_SUBMAKEFILES_RULE = 1

9
media/webrtc/signaling/signaling.gyp
View File

@ -13,15 +13,6 @@
'chromium_code': 1,
},
'target_defaults': {
'conditions': [
['moz_widget_toolkit_gonk==1', {
'defines' : [
'WEBRTC_GONK',
],
}],
],
},
'targets': [
#

5
media/webrtc/signaling/src/sipcc/cpr/linux/cpr_linux_init.c
View File

@ -117,13 +117,8 @@
#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"
/**

29
media/webrtc/signaling/src/sipcc/cpr/linux/cpr_linux_ipc.c
View File

@ -36,15 +36,8 @@
#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"
@ -52,28 +45,6 @@ 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

5
media/webrtc/signaling/src/sipcc/cpr/linux/cpr_linux_socket.c
View File

@ -12,13 +12,8 @@
#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>

2
media/webrtc/signaling/test/Makefile.in
View File

@ -136,7 +136,6 @@ LOCAL_INCLUDES += \
$(NULL)
ifneq ($(OS_TARGET),WINNT)
ifneq (gonk,$(MOZ_WIDGET_TOOLKIT))
ifdef JS_SHARED_LIBRARY
LIBS += $(MOZ_ZLIB_LIBS)
endif
@ -147,7 +146,6 @@ CPP_UNIT_TESTS = \
mediaconduit_unittests.cpp \
$(NULL)
endif
endif
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/media/webrtc/webrtc-config.mk

7
media/webrtc/trunk/build/common.gypi
View File

@ -874,13 +874,6 @@
'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)',

2
media/webrtc/trunk/src/build/arm_neon.gypi
View File

@ -21,7 +21,7 @@
{
'conditions': [
['OS=="android" or moz_widget_toolkit_gonk==1', {
['OS=="android"', {
'cflags!': [
'-mfpu=vfpv3-d16',
],

13
media/webrtc/trunk/src/build/common.gypi
View File

@ -120,12 +120,6 @@
#'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.
@ -179,13 +173,6 @@
],
}],
['OS=="linux"', {
'conditions': [
['moz_have_clock_monotonic==1', {
'defines': [
'WEBRTC_CLOCK_TYPE_REALTIME',
],
}],
],
'defines': [
'WEBRTC_LINUX',
'WEBRTC_THREAD_RR',

7
media/webrtc/trunk/src/modules/audio_device/main/source/linux/audio_device_alsa_linux.h
View File

@ -15,15 +15,10 @@
#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
{

4
media/webrtc/trunk/src/modules/audio_device/main/source/linux/audio_mixer_manager_alsa_linux.h
View File

@ -16,11 +16,7 @@
#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
{

4
media/webrtc/trunk/src/system_wrappers/source/aligned_malloc.cc
View File

@ -29,10 +29,6 @@
#include <stdint.h>
#endif
#ifdef WEBRTC_GONK
#include <string.h>
#endif
#include "typedefs.h"
// Ok reference on memory alignment:

2
media/webrtc/trunk/src/system_wrappers/source/cpu_info.cc
View File

@ -40,7 +40,7 @@ WebRtc_UWord32 CpuInfo::DetectNumberOfCores()
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);

4
media/webrtc/trunk/src/system_wrappers/source/thread_posix.cc
View File

@ -129,7 +129,7 @@ uint32_t ThreadWrapper::GetThreadId() {
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)
@ -284,7 +284,7 @@ void ThreadPosix::SetNotAlive()
bool ThreadPosix::Shutdown()
{
#if !defined(WEBRTC_ANDROID) && !defined(WEBRTC_GONK)
#if !defined(WEBRTC_ANDROID)
if (_thread && (0 != pthread_cancel(_thread)))
{
return false;

7
media/webrtc/trunk/supplement/supplement.gypi
View File

@ -8,10 +8,5 @@
'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,
}],
],
},
}
}