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.
This commit is contained in:
wolfbeast 2019-11-14 09:07:29 +01:00 committed by Roy Tam
commit 729ee0f18a
97 changed files with 32340 additions and 11587 deletions

View file

@ -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
]