summaryrefslogtreecommitdiffstats
path: root/modules/brotli/moz.build
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-11-14 09:07:29 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-11-14 09:07:29 +0100
commit56de283899bc91f7110aba58a3ca174c10852683 (patch)
tree779e6501bbbe4f015509c423ab44f2f40ea97cc8 /modules/brotli/moz.build
parentce0dd36a78814c59950fde6c19413c1f7ea85ee1 (diff)
downloadUXP-56de283899bc91f7110aba58a3ca174c10852683.tar
UXP-56de283899bc91f7110aba58a3ca174c10852683.tar.gz
UXP-56de283899bc91f7110aba58a3ca174c10852683.tar.lz
UXP-56de283899bc91f7110aba58a3ca174c10852683.tar.xz
UXP-56de283899bc91f7110aba58a3ca174c10852683.zip
Issue #1288 - Part 1a: Update brotli to 1.0.7
This also reorganizes the exports in the build system to use `brotli/` as include directory.
Diffstat (limited to 'modules/brotli/moz.build')
-rw-r--r--modules/brotli/moz.build53
1 files changed, 45 insertions, 8 deletions
diff --git a/modules/brotli/moz.build b/modules/brotli/moz.build
index 02c94ed9b..08ebebeae 100644
--- a/modules/brotli/moz.build
+++ b/modules/brotli/moz.build
@@ -4,19 +4,21 @@
# 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/bit_reader.h',
- 'dec/decode.h',
- 'dec/huffman.h',
- 'dec/port.h',
- 'dec/state.h',
- 'dec/types.h',
+with Files('**'):
+ BUG_COMPONENT = ('Core', 'General')
+
+EXPORTS.brotli += [
+ 'include/brotli/decode.h',
+ 'include/brotli/encode.h',
+ 'include/brotli/port.h',
+ 'include/brotli/types.h',
]
UNIFIED_SOURCES += [
+ 'common/dictionary.c',
+ 'common/transform.c',
'dec/bit_reader.c',
'dec/decode.c',
- 'dec/dictionary.c',
'dec/huffman.c',
'dec/state.c',
]
@@ -24,6 +26,41 @@ UNIFIED_SOURCES += [
# We allow warnings for third-party code that can be updated from upstream.
ALLOW_COMPILER_WARNINGS = True
+LOCAL_INCLUDES += [
+ 'include',
+]
+
CFLAGS += ['-DBROTLI_BUILD_PORTABLE']
Library('brotli')
+
+HostProgram('brotli')
+
+HOST_SOURCES += UNIFIED_SOURCES
+
+HOST_SOURCES += [
+ 'enc/backward_references.c',
+ 'enc/backward_references_hq.c',
+ 'enc/bit_cost.c',
+ 'enc/block_splitter.c',
+ 'enc/brotli_bit_stream.c',
+ 'enc/cluster.c',
+ 'enc/compress_fragment.c',
+ 'enc/compress_fragment_two_pass.c',
+ 'enc/dictionary_hash.c',
+ 'enc/encode.c',
+ 'enc/encoder_dict.c',
+ 'enc/entropy_encode.c',
+ 'enc/histogram.c',
+ 'enc/literal_cost.c',
+ 'enc/memory.c',
+ 'enc/metablock.c',
+ 'enc/static_dict.c',
+ 'enc/utf8_util.c',
+ 'tools/brotli.c',
+]
+
+if CONFIG['HOST_CC_TYPE'] not in ('msvc', 'clang-cl'):
+ HOST_OS_LIBS += [
+ 'm' # for log2() function used by Brotli encoder
+ ]