зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1452509 - Make -DMOZ_ALSA global and prune duplicate -DMOZ_PULSEAUDIO. r=froydnj
MozReview-Commit-ID: 6O0pkscXczw --HG-- extra : rebase_source : 0d8dffa1f8e4942b3fe8832ad860409ec24784a2
This commit is contained in:
Родитель
60f9bc442d
Коммит
4c4327e871
|
@ -2609,6 +2609,7 @@ MOZ_ARG_ENABLE_BOOL(alsa,
|
|||
MOZ_ALSA=)
|
||||
|
||||
if test -n "$MOZ_ALSA"; then
|
||||
AC_DEFINE(MOZ_ALSA)
|
||||
PKG_CHECK_MODULES(MOZ_ALSA, alsa, ,
|
||||
[echo "$MOZ_ALSA_PKG_ERRORS"
|
||||
AC_MSG_ERROR([Need alsa for audio output on Linux. (On Ubuntu, you might try installing the package libasound2-dev.)])])
|
||||
|
|
|
@ -17,11 +17,6 @@ SOURCES += [
|
|||
'SandboxBrokerRealpath.cpp',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_ALSA']:
|
||||
DEFINES['MOZ_ALSA'] = True
|
||||
if CONFIG['MOZ_PULSEAUDIO']:
|
||||
DEFINES['MOZ_PULSEAUDIO'] = True
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'/security/sandbox/linux', # SandboxLogging.h, SandboxInfo.h
|
||||
]
|
||||
|
|
|
@ -26,9 +26,6 @@ USE_LIBS += [
|
|||
'mozsandbox',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_ALSA']:
|
||||
DEFINES['MOZ_ALSA'] = True
|
||||
|
||||
# For the X11 socket domain inspection in SandboxLaunch:
|
||||
CXXFLAGS += CONFIG['TK_CFLAGS']
|
||||
|
||||
|
|
|
@ -80,9 +80,6 @@ if CONFIG['MOZ_GMP_SANDBOX']:
|
|||
'SandboxOpenedFiles.cpp',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_ALSA']:
|
||||
DEFINES['MOZ_ALSA'] = True
|
||||
|
||||
# This copy of SafeSPrintf doesn't need to avoid the Chromium logging
|
||||
# dependency like the one in libxul does, but this way the behavior is
|
||||
# consistent. See also the comment in SandboxLogging.h.
|
||||
|
@ -105,9 +102,6 @@ if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
|
|||
if '-flto' in CONFIG['OS_CXXFLAGS'] and CONFIG['CC_TYPE'] != 'clang':
|
||||
LDFLAGS += ['--param lto-partitions=1']
|
||||
|
||||
if CONFIG['MOZ_ALSA']:
|
||||
DEFINES['MOZ_ALSA'] = True
|
||||
|
||||
DEFINES['NS_NO_XPCOM'] = True
|
||||
DisableStlWrapping()
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче