Bug 1088488 - make librlz a library, link into plugin-container. r=glandium
--- a/dom/media/gmp/rlz/moz.build
+++ b/dom/media/gmp/rlz/moz.build
@@ -2,19 +2,20 @@
# 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/.
# Note: build rlz in its own moz.build, so it doesn't pickup any of
# Chromium IPC's headers used in the moz.build of the parent file.
+Library('rlz')
+FORCE_STATIC_LIB = True
+USE_STATIC_LIBS = True
+
UNIFIED_SOURCES += [
'lib/string_utils.cc',
'win/lib/machine_id_win.cc',
]
-FINAL_LIBRARY = 'xul'
-FAIL_ON_WARNINGS = True
-
LOCAL_INCLUDES += [
'..',
]
\ No newline at end of file
--- a/ipc/app/moz.build
+++ b/ipc/app/moz.build
@@ -43,16 +43,17 @@ if CONFIG['OS_TARGET'] != 'Android':
if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_ARCH'] == 'WINNT':
# For sandbox includes and the include dependencies those have
LOCAL_INCLUDES += [
'/security',
'/security/sandbox',
'/security/sandbox/chromium',
]
USE_LIBS += [
+ 'rlz',
'sandbox_staticruntime_s',
]
DELAYLOAD_DLLS += [
'mozalloc.dll',
'nss3.dll',
'xul.dll'
]