Commit c758efa2 authored by Victor Vasiliev's avatar Victor Vasiliev Committed by Chromium LUCI CQ

Roll src/net/third_party/quiche/src/ 528c36b3c..63bdfe586 (2 commits)

https://quiche.googlesource.com/quiche.git/+log/528c36b3cfd0..63bdfe586f8c

$ git log 528c36b3c..63bdfe586 --date=short --no-merges --format='%ad %ae %s'
2020-12-30 quiche-dev Project import generated by Copybara.
2020-12-29 quiche-dev Project import generated by Copybara.

Created with:
  roll-dep src/net/third_party/quiche/src

Change-Id: Ic1f5018507595da795dbf8c0cc94fafdf1ea0c9a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2602891Reviewed-by: default avatarEugene But <eugenebut@chromium.org>
Reviewed-by: default avatarDavid Trainor <dtrainor@chromium.org>
Reviewed-by: default avatarDavid Schinazi <dschinazi@chromium.org>
Commit-Queue: Victor Vasiliev <vasilvv@chromium.org>
Cr-Commit-Position: refs/heads/master@{#841250}
parent e9026f81
...@@ -318,7 +318,7 @@ vars = { ...@@ -318,7 +318,7 @@ vars = {
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling feed # the commit queue can handle CLs rolling feed
# and whatever else without interference from each other. # and whatever else without interference from each other.
'quiche_revision': '528c36b3cfd0110e56b1158f8f58d833817991e0', 'quiche_revision': '63bdfe586f8ceddf5e0823b75b1c595cbd380b2e',
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling ios_webkit # the commit queue can handle CLs rolling ios_webkit
# and whatever else without interference from each other. # and whatever else without interference from each other.
......
...@@ -19,6 +19,7 @@ source_set("cc") { ...@@ -19,6 +19,7 @@ source_set("cc") {
"//content/public/browser", "//content/public/browser",
"//media", "//media",
"//mojo/public/cpp/bindings", "//mojo/public/cpp/bindings",
"//net",
"//skia", "//skia",
"//ui/gfx", "//ui/gfx",
] ]
...@@ -45,6 +46,7 @@ source_set("unit_tests") { ...@@ -45,6 +46,7 @@ source_set("unit_tests") {
deps = [ deps = [
":cc", ":cc",
"//base", "//base",
"//net",
"//testing/gmock", "//testing/gmock",
"//testing/gtest", "//testing/gtest",
] ]
......
...@@ -434,6 +434,8 @@ const struct QuicErrorMapping { ...@@ -434,6 +434,8 @@ const struct QuicErrorMapping {
{quic::QUIC_INVALID_0RTT_PACKET_NUMBER_OUT_OF_ORDER, {quic::QUIC_INVALID_0RTT_PACKET_NUMBER_OUT_OF_ORDER,
"quic.quic_invalid_0rtt_packet_number_out_of_order"}, "quic.quic_invalid_0rtt_packet_number_out_of_order"},
{quic::QUIC_INVALID_PRIORITY_UPDATE, "quic::quic_invalid_priority_update"}, {quic::QUIC_INVALID_PRIORITY_UPDATE, "quic::quic_invalid_priority_update"},
{quic::QUIC_PEER_PORT_CHANGE_HANDSHAKE_UNCONFIRMED,
"quic.peer_port_change_handshake_unconfirmed"},
// No error. Used as bound while iterating. // No error. Used as bound while iterating.
{quic::QUIC_LAST_ERROR, "quic.last_error"}}; {quic::QUIC_LAST_ERROR, "quic.last_error"}};
......
...@@ -31,6 +31,7 @@ source_set("unittests") { ...@@ -31,6 +31,7 @@ source_set("unittests") {
deps = [ deps = [
"//base", "//base",
"//ios/web/public",
"//ios/web/public/web_view_only", "//ios/web/public/web_view_only",
"//ios/web/test:test_support", "//ios/web/test:test_support",
......
...@@ -6,6 +6,10 @@ import("//build/config/chromeos/ui_mode.gni") ...@@ -6,6 +6,10 @@ import("//build/config/chromeos/ui_mode.gni")
import("//testing/libfuzzer/fuzzer_test.gni") import("//testing/libfuzzer/fuzzer_test.gni")
import("//third_party/protobuf/proto_library.gni") import("//third_party/protobuf/proto_library.gni")
config("quiche_config") {
include_dirs = [ "src" ]
}
# Since //net and //net/third_party/quiche have a circular dependency on each # Since //net and //net/third_party/quiche have a circular dependency on each
# other, exporting dependencies from the :quiche target directly does not work. # other, exporting dependencies from the :quiche target directly does not work.
# Thus, all public dependencies for QUICHE should go into the target below, # Thus, all public dependencies for QUICHE should go into the target below,
...@@ -13,6 +17,7 @@ import("//third_party/protobuf/proto_library.gni") ...@@ -13,6 +17,7 @@ import("//third_party/protobuf/proto_library.gni")
source_set("quiche_public_deps") { source_set("quiche_public_deps") {
visibility = [ "//net:net_public_deps" ] visibility = [ "//net:net_public_deps" ]
public_configs = [ ":quiche_config" ]
public_deps = [ "//third_party/abseil-cpp:absl" ] public_deps = [ "//third_party/abseil-cpp:absl" ]
} }
...@@ -639,6 +644,8 @@ proto_library("net_quic_proto") { ...@@ -639,6 +644,8 @@ proto_library("net_quic_proto") {
cc_include = "net/base/net_export.h" cc_include = "net/base/net_export.h"
component_build_force_source_set = true component_build_force_source_set = true
proto_in_dir = "src"
deps = [ "//net:net_export_header" ] deps = [ "//net:net_export_header" ]
defines = [ "NET_IMPLEMENTATION" ] defines = [ "NET_IMPLEMENTATION" ]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment