Chromium Code Reviews| Index: third_party/brotli/BUILD.gn |
| diff --git a/third_party/brotli/BUILD.gn b/third_party/brotli/BUILD.gn |
| index f012b543626115dd9255a5a8616bb370d503ec8a..2acb54b50760faf6194048f2788142fd407f758c 100644 |
| --- a/third_party/brotli/BUILD.gn |
| +++ b/third_party/brotli/BUILD.gn |
| @@ -6,15 +6,26 @@ if (is_win) { |
| import("//build/config/win/visual_studio_version.gni") |
| } |
| -static_library("brotli") { |
| +config("includes") { |
| + include_dirs = [ "include" ] |
| +} |
| + |
| +static_library("common") { |
| + sources = [ |
| + "common/constants.h", |
| + "common/dictionary.c", |
| + "common/dictionary.h", |
| + "common/version.h", |
| + ] |
| + public_configs = [ ":includes" ] |
|
Kunihiko Sakamoto
2016/12/05 02:27:00
Since you're using #include "third_party/brotli/..
eustas
2016/12/05 14:15:01
decode.h and encode.h include <brotli/port.h> and
|
| +} |
| + |
| +static_library("dec") { |
| sources = [ |
| "dec/bit_reader.c", |
| "dec/bit_reader.h", |
| "dec/context.h", |
| "dec/decode.c", |
| - "dec/decode.h", |
| - "dec/dictionary.c", |
| - "dec/dictionary.h", |
| "dec/huffman.c", |
| "dec/huffman.h", |
| "dec/port.h", |
| @@ -22,7 +33,11 @@ static_library("brotli") { |
| "dec/state.c", |
| "dec/state.h", |
| "dec/transform.h", |
| - "dec/types.h", |
| + ] |
| + public_configs = [ ":includes" ] |
|
Kunihiko Sakamoto
2016/12/05 02:27:00
Same here
eustas
2016/12/05 14:15:01
Acknowledged.
|
| + |
| + deps = [ |
| + ":common", |
| ] |
| configs -= [ "//build/config/compiler:chromium_code" ] |
| @@ -31,62 +46,71 @@ static_library("brotli") { |
| # Since we are never debug brotli, freeze the optimizations to -O2. |
| configs -= [ "//build/config/compiler:default_optimization" ] |
| configs += [ "//build/config/compiler:optimize_max" ] |
| - |
| - include_dirs = [ "dec" ] |
| } |
| if (current_toolchain == host_toolchain) { |
| executable("bro") { |
| sources = [ |
| - "enc/backward_references.cc", |
| + "common/constants.h", |
| + "enc/backward_references.c", |
| "enc/backward_references.h", |
| + "enc/backward_references_inc.h", |
| + "enc/bit_cost.c", |
| "enc/bit_cost.h", |
| - "enc/block_splitter.cc", |
| + "enc/bit_cost_inc.h", |
| + "enc/block_encoder_inc.h", |
| + "enc/block_splitter.c", |
| "enc/block_splitter.h", |
| - "enc/brotli_bit_stream.cc", |
| + "enc/block_splitter_inc.h", |
| + "enc/brotli_bit_stream.c", |
| "enc/brotli_bit_stream.h", |
| + "enc/cluster.c", |
| "enc/cluster.h", |
| + "enc/cluster_inc.h", |
| "enc/command.h", |
| - "enc/compress_fragment.cc", |
| + "enc/compress_fragment.c", |
| "enc/compress_fragment.h", |
| - "enc/compress_fragment_two_pass.cc", |
| + "enc/compress_fragment_two_pass.c", |
| "enc/compress_fragment_two_pass.h", |
| - "enc/compressor.h", |
| "enc/context.h", |
| "enc/dictionary_hash.h", |
| - "enc/encode.cc", |
| - "enc/encode.h", |
| - "enc/encode_parallel.cc", |
| - "enc/encode_parallel.h", |
| - "enc/entropy_encode.cc", |
| + "enc/encode.c", |
| + "enc/entropy_encode.c", |
| "enc/entropy_encode.h", |
| "enc/entropy_encode_static.h", |
| "enc/fast_log.h", |
| "enc/find_match_length.h", |
| - "enc/hash.h ", |
| - "enc/histogram.cc", |
| + "enc/hash.h", |
| + "enc/hash_forgetful_chain_inc.h", |
| + "enc/hash_longest_match_inc.h", |
| + "enc/hash_longest_match_quickly_inc.h", |
| + "enc/histogram.c", |
| "enc/histogram.h", |
| - "enc/literal_cost.cc", |
| + "enc/histogram_inc.h", |
| + "enc/literal_cost.c", |
| "enc/literal_cost.h", |
| - "enc/metablock.cc", |
| + "enc/memory.c", |
| + "enc/memory.h", |
| + "enc/metablock.c", |
| "enc/metablock.h", |
| - "enc/port.h ", |
| + "enc/metablock_inc.h", |
| + "enc/port.h", |
| "enc/prefix.h", |
| + "enc/quality.h", |
| "enc/ringbuffer.h", |
| - "enc/static_dict.cc", |
| + "enc/static_dict.c", |
| "enc/static_dict.h", |
| "enc/static_dict_lut.h", |
| - "enc/streams.cc", |
| - "enc/streams.h", |
| - "enc/transform.h", |
| - "enc/types.h", |
| - "enc/utf8_util.cc", |
| + "enc/utf8_util.c", |
| "enc/utf8_util.h", |
| "enc/write_bits.h", |
| - "tools/bro.cc", |
| + "tools/bro.c", |
| ] |
| + public_configs = [ ":includes" ] |
|
Kunihiko Sakamoto
2016/12/05 02:27:00
Same here
eustas
2016/12/05 14:15:01
Acknowledged.
|
| + |
| deps = [ |
| - ":brotli", |
| + ":common", |
| + ":dec", |
| "//build/config/sanitizers:deps", |
| "//build/win:default_exe_manifest", |
| ] |