Move core functionality to QuicTransportBaseLite [25/n]

Summary: See title. Reviewed By: jbeshay Differential Revision: D65605147 fbshipit-source-id: 11b1f48f922e7e8eb8fbe42f0630865270480994
facebook · Nov 15, 2024 · eb26c68 · eb26c68
1 parent b92b323
commit eb26c68
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 10 deletions.
diff --git a/quic/api/BUCK b/quic/api/BUCK
@@ -46,12 +46,9 @@ mvfst_cpp_library(
     name = "transport",
     srcs = [
         "QuicTransportBase.cpp",
-        "QuicTransportBaseLite.cpp",
     ],
     headers = [
         "QuicSocket.h",
-        "QuicSocketLite.h",
-        "QuicTransportBase.h",
         "QuicTransportBaseLite.h",
     ],
     deps = [
@@ -60,25 +57,21 @@ mvfst_cpp_library(
         "//folly:chrono",
         "//folly:scope_guard",
         "//quic/common:time_util",
-        "//quic/congestion_control:ecn_l4s_tracker",
         "//quic/congestion_control:pacer",
-        "//quic/flowcontrol:flow_control",
         "//quic/logging:qlogger_constants",
         "//quic/loss:loss",
         "//quic/state:pacing_functions",
         "//quic/state:simple_frame_functions",
         "//quic/state:state_functions",
         "//quic/state:stream_functions",
-        "//quic/state/stream:stream",
     ],
     exported_deps = [
-        ":quic_callbacks",
         ":transport_helpers",
+        ":transport_lite",
         "//folly:exception_wrapper",
         "//folly:maybe_managed_ptr",
         "//folly:portability",
         "//folly/io:iobuf",
-        "//folly/io/async:async_transport_certificate",
         "//quic:constants",
         "//quic:exception",
         "//quic/codec:types",
@@ -94,7 +87,6 @@ mvfst_cpp_library(
         "//quic/congestion_control:copa",
         "//quic/congestion_control:cubic",
         "//quic/congestion_control:newreno",
-        "//quic/handshake:transport_parameters",
         "//quic/observer:socket_observer_container",
         "//quic/observer:socket_observer_types",
         "//quic/state:quic_connection_stats",
@@ -105,6 +97,40 @@ mvfst_cpp_library(
     ],
 )
 
+mvfst_cpp_library(
+    name = "transport_lite",
+    srcs = [
+        "QuicTransportBaseLite.cpp",
+    ],
+    headers = [
+        "QuicSocketLite.h",
+        "QuicTransportBaseLite.h",
+    ],
+    deps = [
+        ":loop_detector_callback",
+        "//quic/congestion_control:congestion_controller_factory",
+        "//quic/congestion_control:ecn_l4s_tracker",
+        "//quic/congestion_control:pacer",
+        "//quic/flowcontrol:flow_control",
+        "//quic/loss:loss",
+        "//quic/state:pacing_functions",
+        "//quic/state:stream_functions",
+        "//quic/state/stream:stream",
+    ],
+    exported_deps = [
+        ":quic_callbacks",
+        ":transport_helpers",
+        "//folly:maybe_managed_ptr",
+        "//folly/io/async:async_transport_certificate",
+        "//quic:exception",
+        "//quic/codec:types",
+        "//quic/common:looper",
+        "//quic/common/udpsocket:quic_async_udp_socket",
+        "//quic/handshake:transport_parameters",
+        "//quic/state:quic_state_machine",
+    ],
+)
+
 mvfst_cpp_library(
     name = "transport_helpers",
     srcs = [

diff --git a/quic/somerge_defs.bzl b/quic/somerge_defs.bzl
@@ -2,7 +2,7 @@
 
 Generated by xplat/cross_plat_devx/somerge_maps/compute_merge_maps.py
 
-@generated SignedSource<<80ffdf62b2f4f6fb1c36eb1882d65531>>
+@generated SignedSource<<2acf70359b15e9f411f267dbf9169d14>>
 """
 
 # Entry Points:
@@ -35,6 +35,8 @@ QUIC_NATIVE_LIBRARY_MERGE_MAP = [
     "fbsource//xplat/quic/api:transportAndroidAndroid",
     "fbsource//xplat/quic/api:transport_helpersAndroid",
     "fbsource//xplat/quic/api:transport_helpersAndroidAndroid",
+    "fbsource//xplat/quic/api:transport_liteAndroid",
+    "fbsource//xplat/quic/api:transport_liteAndroidAndroid",
     "fbsource//xplat/quic/client:cached_server_tpAndroid",
     "fbsource//xplat/quic/client:cached_server_tpAndroidAndroid",
     "fbsource//xplat/quic/client:clientAndroid",