Bug 1066160 pt 2 - Include Brotli in the gecko build. r=gps
authorJonathan Kew <jkew@mozilla.com>
Sat, 04 Oct 2014 10:02:24 +0100
changeset 208815 06200548262b5ebe423723a81b7b4299aa492012
parent 208814 3f412cb1d5ce40901c064449149adfb143ded7b3
child 208816 689da8627d4d1b05988353924fc915557546e3c1
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersgps
bugs1066160
milestone35.0a1
Bug 1066160 pt 2 - Include Brotli in the gecko build. r=gps
config/external/moz.build
modules/brotli/moz.build
--- a/config/external/moz.build
+++ b/config/external/moz.build
@@ -11,16 +11,19 @@ DIRS += [
 ]
 if not CONFIG['MOZ_NATIVE_JPEG']:
     external_dirs += ['media/libjpeg']
 
 if CONFIG['MOZ_UPDATER']:
     if not CONFIG['MOZ_NATIVE_BZ2']:
         external_dirs += ['modules/libbz2']
 
+# There's no "native brotli" yet, but probably in the future...
+external_dirs += ['modules/brotli']
+
 if CONFIG['MOZ_VORBIS']:
     external_dirs += ['media/libvorbis']
 
 if CONFIG['MOZ_TREMOR']:
     external_dirs += ['media/libtremor']
 
 if CONFIG['MOZ_OPUS']:
     external_dirs += ['media/libopus']
new file mode 100644
--- /dev/null
+++ b/modules/brotli/moz.build
@@ -0,0 +1,21 @@
+# -*- 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/.
+
+EXPORTS += [
+    'dec/decode.h',
+    'dec/streams.h',
+    'dec/types.h',
+]
+
+UNIFIED_SOURCES += [
+    'dec/bit_reader.c',
+    'dec/decode.c',
+    'dec/huffman.c',
+    'dec/safe_malloc.c',
+    'dec/streams.c',
+]
+
+Library('brotli')