Bug 1176300 - Add lgpllibs library to build system; r=glandium

This commit is contained in:
Kyle Machulis 2015-07-01 21:11:46 -07:00
parent ce84d31c0e
commit 3a233ed321
7 changed files with 20 additions and 0 deletions

View File

@ -128,6 +128,7 @@
#ifndef MOZ_FOLD_LIBS #ifndef MOZ_FOLD_LIBS
@BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
#endif #endif
@BINPATH@/@DLL_PREFIX@lgpllibs@DLL_SUFFIX@
@RESPATH@/blocklist.xml @RESPATH@/blocklist.xml
@RESPATH@/ua-update.json @RESPATH@/ua-update.json
#ifdef XP_UNIX #ifdef XP_UNIX

View File

@ -151,6 +151,7 @@
@BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
#endif #endif
#endif #endif
@BINPATH@/@DLL_PREFIX@lgpllibs@DLL_SUFFIX@
@RESPATH@/browser/blocklist.xml @RESPATH@/browser/blocklist.xml
#ifdef XP_UNIX #ifdef XP_UNIX
#ifndef XP_MACOSX #ifndef XP_MACOSX

14
config/external/lgpllibs/moz.build vendored Normal file
View File

@ -0,0 +1,14 @@
# -*- 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/.
# The lgpllibs library stores symbols from third-party LGPL licensed libraries,
# such as libav and libsoundtouch. It fulfills the requirement of dynamically
# linking these symbols into gecko.
#
# Any library added here should also be reflected in the about:license page.
SharedLibrary('lgpllibs')
SHARED_LIBRARY_NAME = 'lgpllibs'

View File

@ -7,6 +7,7 @@
external_dirs = [] external_dirs = []
DIRS += [ DIRS += [
'lgpllibs',
'sqlite', 'sqlite',
] ]
if not CONFIG['MOZ_NATIVE_JPEG']: if not CONFIG['MOZ_NATIVE_JPEG']:

View File

@ -42,6 +42,7 @@
@BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
@BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
#endif #endif
@BINPATH@/@DLL_PREFIX@lgpllibs@DLL_SUFFIX@
@BINPATH@/@DLL_PREFIX@omxplugin@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@omxplugin@DLL_SUFFIX@
@BINPATH@/@DLL_PREFIX@omxplugingb@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@omxplugingb@DLL_SUFFIX@
@BINPATH@/@DLL_PREFIX@omxplugingb235@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@omxplugingb235@DLL_SUFFIX@

View File

@ -108,6 +108,7 @@ if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_ARCH'] == 'WINNT':
USE_LIBS += [ USE_LIBS += [
'gkmedias', 'gkmedias',
'lgpllibs',
'nspr', 'nspr',
'nss', 'nss',
'sqlite', 'sqlite',

View File

@ -287,6 +287,7 @@ DIST_FILES += \
$(NULL) $(NULL)
endif endif
DIST_FILES += \ DIST_FILES += \
liblgpllibs.so \
libxul.so \ libxul.so \
libnssckbi.so \ libnssckbi.so \
libfreebl3.so \ libfreebl3.so \