diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/net/dns/BUILD.gn | |
parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
download | qtwebengine-chromium-85-based.tar.gz |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/net/dns/BUILD.gn')
-rw-r--r-- | chromium/net/dns/BUILD.gn | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/chromium/net/dns/BUILD.gn b/chromium/net/dns/BUILD.gn index 74680eccfea..3e24edd0b48 100644 --- a/chromium/net/dns/BUILD.gn +++ b/chromium/net/dns/BUILD.gn @@ -5,6 +5,10 @@ import("//net/features.gni") import("//testing/libfuzzer/fuzzer_test.gni") +if (is_android) { + import("//build/config/android/rules.gni") +} + enable_built_in_dns = !is_ios source_set("dns") { @@ -62,7 +66,6 @@ source_set("dns") { "dns_transaction.cc", "dns_udp_tracker.cc", "dns_udp_tracker.h", - "esni_content.cc", "host_cache.cc", "host_resolver.cc", "host_resolver_manager.cc", @@ -72,6 +75,8 @@ source_set("dns") { "host_resolver_mdns_task.h", "host_resolver_proc.cc", "host_resolver_proc.h", + "httpssvc_metrics.cc", + "httpssvc_metrics.h", "mapped_host_resolver.cc", "notify_watcher_mac.cc", "notify_watcher_mac.h", @@ -198,7 +203,6 @@ source_set("host_resolver") { sources += [ "dns_config.h", "dns_config_overrides.h", - "esni_content.h", "host_cache.h", "host_resolver.h", "host_resolver_source.h", @@ -371,6 +375,12 @@ source_set("mdns_client") { public_deps = [ "//net:net_public_deps" ] } +if (is_android) { + java_cpp_enum("secure_dns_mode_generated_enum") { + sources = [ "dns_config.h" ] + } +} + source_set("tests") { testonly = true sources = [ @@ -386,9 +396,9 @@ source_set("tests") { "dns_transaction_unittest.cc", "dns_udp_tracker_unittest.cc", "dns_util_unittest.cc", - "esni_content_unittest.cc", "host_cache_unittest.cc", "host_resolver_manager_unittest.cc", + "httpssvc_metrics_unittest.cc", "mapped_host_resolver_unittest.cc", "record_parsed_unittest.cc", "record_rdata_unittest.cc", |