Index: net/BUILD.gn |
diff --git a/net/BUILD.gn b/net/BUILD.gn |
index 928d1af83dcbf8f870f59b487989fa3cc2708cd9..6e3625b8a512cba3f9a21fc3a07f9aa99addb901 100644 |
--- a/net/BUILD.gn |
+++ b/net/BUILD.gn |
@@ -281,6 +281,7 @@ component("net") { |
"http/http_vary_data.h", |
"http/transport_security_state.cc", |
"http/transport_security_state.h", |
+ "http/transport_security_state_structs.h", |
"log/net_log.cc", |
"log/net_log.h", |
"log/net_log_capture_mode.cc", |
@@ -4736,6 +4737,7 @@ test("net_unittests") { |
"//crypto:platform", |
"//crypto:test_support", |
"//net/base/registry_controlled_domains", |
+ "//net/tools/transport_security_state_generator:generate_test_data", |
"//testing/gmock", |
"//testing/gtest", |
"//third_party/zlib", |
@@ -5096,6 +5098,11 @@ test("net_unittests") { |
sources += [ "ssl/ssl_platform_key_chromecast_unittest.cc" ] |
sources -= [ "ssl/ssl_platform_key_nss_unittest.cc" ] |
} |
+ |
+ # Include transport_security_state_generator tests. |
+ if (host_toolchain == current_toolchain && !is_proto_quic) { |
+ deps += [ "//net/tools/transport_security_state_generator:transport_security_state_generator_test_sources" ] |
+ } |
} |
# !is_android && !is_win && !is_mac |
@@ -5665,36 +5672,3 @@ fuzzer_test("net_http_server_fuzzer") { |
dict = "data/fuzzer_dictionaries/net_http_server_fuzzer.dict" |
seed_corpus = "data/fuzzer_data/http_server_requests/" |
} |
- |
-if (host_toolchain == current_toolchain && !is_proto_quic) { |
- executable("transport_security_state_generator") { |
- sources = [ |
- "tools/transport_security_state_generator/bit_writer.cc", |
- "tools/transport_security_state_generator/bit_writer.h", |
- "tools/transport_security_state_generator/cert_util.cc", |
- "tools/transport_security_state_generator/cert_util.h", |
- "tools/transport_security_state_generator/huffman/huffman_builder.cc", |
- "tools/transport_security_state_generator/huffman/huffman_builder.h", |
- "tools/transport_security_state_generator/pinset.cc", |
- "tools/transport_security_state_generator/pinset.h", |
- "tools/transport_security_state_generator/pinsets.cc", |
- "tools/transport_security_state_generator/pinsets.h", |
- "tools/transport_security_state_generator/preloaded_state_generator.cc", |
- "tools/transport_security_state_generator/preloaded_state_generator.h", |
- "tools/transport_security_state_generator/spki_hash.cc", |
- "tools/transport_security_state_generator/spki_hash.h", |
- "tools/transport_security_state_generator/transport_security_state_entry.cc", |
- "tools/transport_security_state_generator/transport_security_state_entry.h", |
- "tools/transport_security_state_generator/transport_security_state_generator.cc", |
- "tools/transport_security_state_generator/trie/trie_bit_buffer.cc", |
- "tools/transport_security_state_generator/trie/trie_bit_buffer.h", |
- "tools/transport_security_state_generator/trie/trie_writer.cc", |
- "tools/transport_security_state_generator/trie/trie_writer.h", |
- ] |
- deps = [ |
- "//base", |
- "//crypto", |
- "//third_party/boringssl", |
- ] |
- } |
-} |