From 3a233ed321501874a2019fd72861d5c4b7a4caae Mon Sep 17 00:00:00 2001
From: Kyle Machulis <kyle@nonpolynomial.com>
Date: Wed, 1 Jul 2015 21:11:46 -0700
Subject: [PATCH] Bug 1176300 - Add lgpllibs library to build system;
 r=glandium

---
 b2g/installer/package-manifest.in            |  1 +
 browser/installer/package-manifest.in        |  1 +
 config/external/lgpllibs/moz.build           | 14 ++++++++++++++
 config/external/moz.build                    |  1 +
 mobile/android/installer/package-manifest.in |  1 +
 toolkit/library/moz.build                    |  1 +
 toolkit/mozapps/installer/upload-files.mk    |  1 +
 7 files changed, 20 insertions(+)
 create mode 100644 config/external/lgpllibs/moz.build

diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in
index 6866cbe65cf..1db1f7f24a9 100644
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -128,6 +128,7 @@
 #ifndef MOZ_FOLD_LIBS
 @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
 #endif
+@BINPATH@/@DLL_PREFIX@lgpllibs@DLL_SUFFIX@
 @RESPATH@/blocklist.xml
 @RESPATH@/ua-update.json
 #ifdef XP_UNIX
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 14dac89c88d..42710fc079c 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -151,6 +151,7 @@
 @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
 #endif
 #endif
+@BINPATH@/@DLL_PREFIX@lgpllibs@DLL_SUFFIX@
 @RESPATH@/browser/blocklist.xml
 #ifdef XP_UNIX
 #ifndef XP_MACOSX
diff --git a/config/external/lgpllibs/moz.build b/config/external/lgpllibs/moz.build
new file mode 100644
index 00000000000..b1cc9420fbe
--- /dev/null
+++ b/config/external/lgpllibs/moz.build
@@ -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'
diff --git a/config/external/moz.build b/config/external/moz.build
index 569d0fc5dd9..769a33d4760 100644
--- a/config/external/moz.build
+++ b/config/external/moz.build
@@ -7,6 +7,7 @@
 external_dirs = []
 
 DIRS += [
+    'lgpllibs',
     'sqlite',
 ]
 if not CONFIG['MOZ_NATIVE_JPEG']:
diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in
index 1c023827968..28269cc3d2b 100644
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -42,6 +42,7 @@
 @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
 #endif
+@BINPATH@/@DLL_PREFIX@lgpllibs@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@omxplugin@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@omxplugingb@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@omxplugingb235@DLL_SUFFIX@
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
index 65ea4e36fa4..8b502852ecd 100644
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -108,6 +108,7 @@ if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_ARCH'] == 'WINNT':
 
 USE_LIBS += [
     'gkmedias',
+    'lgpllibs',
     'nspr',
     'nss',
     'sqlite',
diff --git a/toolkit/mozapps/installer/upload-files.mk b/toolkit/mozapps/installer/upload-files.mk
index 96913dfc5d4..d4f5d93e5b7 100644
--- a/toolkit/mozapps/installer/upload-files.mk
+++ b/toolkit/mozapps/installer/upload-files.mk
@@ -287,6 +287,7 @@ DIST_FILES += \
   $(NULL)
 endif
 DIST_FILES += \
+  liblgpllibs.so \
   libxul.so \
   libnssckbi.so \
   libfreebl3.so \