Bug 1088488 - make librlz a library, link into plugin-container. r=glandium
authorChris Pearce <cpearce@mozilla.com>
Fri, 14 Nov 2014 21:26:24 +1300
changeset 232012 dd073758b0bc177428ef4d6e4560b459a6ef5499
parent 232011 8078ba66f37cd1c9b6b6a63e358ad5bdc0db32bd
child 232013 abf353e4a1a7513c7c8a3557491e1118c9cb6c9e
push id7326
push userbhearsum@mozilla.com
push dateFri, 28 Nov 2014 15:58:42 +0000
treeherdermozilla-aurora@d3a3b2a0f2f8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1088488
milestone36.0a1
Bug 1088488 - make librlz a library, link into plugin-container. r=glandium
dom/media/gmp/rlz/moz.build
ipc/app/moz.build
--- 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'
     ]