Internal change

PiperOrigin-RevId: 496781536

mediapipe/calculators/core/BUILD

@@ -567,7 +567,7 @@ cc_library(
     name = "packet_thinner_calculator",
     srcs = ["packet_thinner_calculator.cc"],
     deps = [
-        "//mediapipe/calculators/core:packet_thinner_calculator_cc_proto",
+        ":packet_thinner_calculator_cc_proto",
         "//mediapipe/framework:calculator_context",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework/formats:video_stream_header",
@@ -584,7 +584,7 @@ cc_test(
     srcs = ["packet_thinner_calculator_test.cc"],
     deps = [
         ":packet_thinner_calculator",
-        "//mediapipe/calculators/core:packet_thinner_calculator_cc_proto",
+        ":packet_thinner_calculator_cc_proto",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework:calculator_runner",
         "//mediapipe/framework/formats:video_stream_header",
@@ -762,7 +762,7 @@ cc_library(
     srcs = ["packet_resampler_calculator.cc"],
     hdrs = ["packet_resampler_calculator.h"],
     deps = [
-        "//mediapipe/calculators/core:packet_resampler_calculator_cc_proto",
+        ":packet_resampler_calculator_cc_proto",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework:collection_item_id",
         "//mediapipe/framework/deps:mathutil",
@@ -786,7 +786,7 @@ cc_test(
     ],
     deps = [
         ":packet_resampler_calculator",
-        "//mediapipe/calculators/core:packet_resampler_calculator_cc_proto",
+        ":packet_resampler_calculator_cc_proto",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework:calculator_runner",
         "//mediapipe/framework/formats:video_stream_header",
@@ -852,10 +852,10 @@ cc_test(
     name = "flow_limiter_calculator_test",
     srcs = ["flow_limiter_calculator_test.cc"],
     deps = [
+        ":counting_source_calculator",
         ":flow_limiter_calculator",
         ":flow_limiter_calculator_cc_proto",
-        "//mediapipe/calculators/core:counting_source_calculator",
+        ":pass_through_calculator",
-        "//mediapipe/calculators/core:pass_through_calculator",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework:calculator_runner",
         "//mediapipe/framework:test_calculators",
@@ -1302,7 +1302,7 @@ cc_test(
     srcs = ["packet_sequencer_calculator_test.cc"],
     deps = [
         ":packet_sequencer_calculator",
-        "//mediapipe/calculators/core:pass_through_calculator",
+        ":pass_through_calculator",
         "//mediapipe/framework:calculator_cc_proto",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework:subgraph",

mediapipe/calculators/image/BUILD

@@ -378,8 +378,8 @@ cc_library(
     name = "scale_image_calculator",
     srcs = ["scale_image_calculator.cc"],
     deps = [
+        ":scale_image_calculator_cc_proto",
         ":scale_image_utils",
-        "//mediapipe/calculators/image:scale_image_calculator_cc_proto",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework/formats:image_format_cc_proto",
         "//mediapipe/framework/formats:image_frame",
@@ -747,8 +747,8 @@ cc_test(
     tags = ["desktop_only_test"],
     deps = [
         ":affine_transformation",
+        ":image_transformation_calculator",
         ":warp_affine_calculator",
-        "//mediapipe/calculators/image:image_transformation_calculator",
         "//mediapipe/calculators/tensor:image_to_tensor_converter",
         "//mediapipe/calculators/tensor:image_to_tensor_utils",
         "//mediapipe/calculators/util:from_image_calculator",

mediapipe/calculators/util/BUILD

@@ -22,8 +22,8 @@ cc_library(
     name = "alignment_points_to_rects_calculator",
     srcs = ["alignment_points_to_rects_calculator.cc"],
     deps = [
+        ":detections_to_rects_calculator",
         ":detections_to_rects_calculator_cc_proto",
-        "//mediapipe/calculators/util:detections_to_rects_calculator",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework:calculator_options_cc_proto",
         "//mediapipe/framework/formats:detection_cc_proto",

mediapipe/framework/BUILD

@@ -226,13 +226,13 @@ cc_library(
         ":mediapipe_internal",
     ],
     deps = [
+        ":calculator_cc_proto",
         ":graph_service",
+        ":mediapipe_options_cc_proto",
+        ":packet_generator_cc_proto",
         ":packet_type",
         ":port",
-        "//mediapipe/framework:calculator_cc_proto",
+        ":status_handler_cc_proto",
-        "//mediapipe/framework:mediapipe_options_cc_proto",
-        "//mediapipe/framework:packet_generator_cc_proto",
-        "//mediapipe/framework:status_handler_cc_proto",
         "//mediapipe/framework/port:any_proto",
         "//mediapipe/framework/port:status",
         "//mediapipe/framework/tool:options_map",
@@ -328,10 +328,10 @@ cc_library(
         ":thread_pool_executor",
         ":timestamp",
         ":validated_graph_config",
-        "//mediapipe/framework:calculator_cc_proto",
+        ":calculator_cc_proto",
-        "//mediapipe/framework:packet_generator_cc_proto",
+        ":packet_generator_cc_proto",
-        "//mediapipe/framework:status_handler_cc_proto",
+        ":status_handler_cc_proto",
-        "//mediapipe/framework:thread_pool_executor_cc_proto",
+        ":thread_pool_executor_cc_proto",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/container:fixed_array",
         "@com_google_absl//absl/container:flat_hash_map",
@@ -391,6 +391,7 @@ cc_library(
     visibility = [":mediapipe_internal"],
     deps = [
         ":calculator_base",
+        ":calculator_cc_proto",
         ":calculator_context",
         ":calculator_context_manager",
         ":calculator_state",
@@ -407,10 +408,9 @@ cc_library(
         ":packet_set",
         ":packet_type",
         ":port",
+        ":stream_handler_cc_proto",
         ":timestamp",
         ":validated_graph_config",
-        "//mediapipe/framework:calculator_cc_proto",
-        "//mediapipe/framework:stream_handler_cc_proto",
         "//mediapipe/framework/port:core_proto",
         "//mediapipe/framework/port:integral_types",
         "//mediapipe/framework/port:logging",
@@ -466,6 +466,7 @@ cc_library(
     hdrs = ["calculator_state.h"],
     visibility = [":mediapipe_internal"],
     deps = [
+        ":calculator_cc_proto",
         ":counter",
         ":counter_factory",
         ":graph_service",
@@ -475,7 +476,6 @@ cc_library(
         ":packet",
         ":packet_set",
         ":port",
-        "//mediapipe/framework:calculator_cc_proto",
         "//mediapipe/framework/port:any_proto",
         "//mediapipe/framework/port:logging",
         "//mediapipe/framework/tool:options_map",
@@ -583,7 +583,7 @@ cc_library(
     hdrs = ["executor.h"],
     visibility = ["//visibility:public"],
     deps = [
-        "//mediapipe/framework:mediapipe_options_cc_proto",
+        ":mediapipe_options_cc_proto",
         "//mediapipe/framework/deps:registration",
         "//mediapipe/framework/port:status",
         "//mediapipe/framework/port:statusor",
@@ -670,11 +670,11 @@ cc_library(
         ":collection_item_id",
         ":input_stream_manager",
         ":input_stream_shard",
+        ":mediapipe_options_cc_proto",
         ":mediapipe_profiling",
         ":packet",
         ":packet_set",
         ":packet_type",
-        "//mediapipe/framework:mediapipe_options_cc_proto",
         "//mediapipe/framework/deps:registration",
         "//mediapipe/framework/port:ret_check",
         "//mediapipe/framework/port:status",
@@ -784,12 +784,12 @@ cc_library(
         ":calculator_context_manager",
         ":collection",
         ":collection_item_id",
+        ":mediapipe_options_cc_proto",
         ":output_stream_manager",
         ":output_stream_shard",
         ":packet_set",
         ":packet_type",
         ":timestamp",
-        "//mediapipe/framework:mediapipe_options_cc_proto",
         "//mediapipe/framework/deps:registration",
         "//mediapipe/framework/port:logging",
         "//mediapipe/framework/port:status",
@@ -875,10 +875,10 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":packet",
+        ":packet_generator_cc_proto",
         ":packet_set",
         ":packet_type",
         ":port",
-        "//mediapipe/framework:packet_generator_cc_proto",
         "//mediapipe/framework/deps:registration",
         "//mediapipe/framework/port:core_proto",
         "//mediapipe/framework/port:status",
@@ -896,13 +896,13 @@ cc_library(
         ":delegating_executor",
         ":executor",
         ":packet",
+        ":packet_factory_cc_proto",
         ":packet_generator",
+        ":packet_generator_cc_proto",
         ":packet_type",
         ":port",
         ":thread_pool_executor",
         ":validated_graph_config",
-        "//mediapipe/framework:packet_factory_cc_proto",
-        "//mediapipe/framework:packet_generator_cc_proto",
         "//mediapipe/framework/port:core_proto",
         "//mediapipe/framework/port:logging",
         "//mediapipe/framework/port:ret_check",
@@ -1019,10 +1019,10 @@ cc_library(
     hdrs = ["status_handler.h"],
     visibility = ["//visibility:public"],
     deps = [
+        ":mediapipe_options_cc_proto",
         ":packet_set",
         ":packet_type",
         ":port",
-        "//mediapipe/framework:mediapipe_options_cc_proto",
         "//mediapipe/framework/deps:registration",
         "//mediapipe/framework/port:status",
         "@com_google_absl//absl/memory",
@@ -1035,10 +1035,10 @@ cc_library(
     hdrs = ["subgraph.h"],
     visibility = ["//visibility:public"],
     deps = [
+        ":calculator_cc_proto",
         ":graph_service",
         ":graph_service_manager",
         ":port",
-        "//mediapipe/framework:calculator_cc_proto",
         "//mediapipe/framework/deps:registration",
         "//mediapipe/framework/port:ret_check",
         "//mediapipe/framework/port:status",
@@ -1097,7 +1097,7 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":executor",
-        "//mediapipe/framework:thread_pool_executor_cc_proto",
+        ":thread_pool_executor_cc_proto",
         "//mediapipe/framework/deps:thread_options",
         "//mediapipe/framework/port:logging",
         "//mediapipe/framework/port:status",
@@ -1162,22 +1162,22 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":calculator_base",
+        ":calculator_cc_proto",
         ":calculator_contract",
         ":graph_service_manager",
         ":legacy_calculator_support",
         ":packet",
         ":packet_generator",
+        ":packet_generator_cc_proto",
         ":packet_set",
         ":packet_type",
         ":port",
         ":status_handler",
+        ":status_handler_cc_proto",
+        ":stream_handler_cc_proto",
         ":subgraph",
+        ":thread_pool_executor_cc_proto",
         ":timestamp",
-        "//mediapipe/framework:calculator_cc_proto",
-        "//mediapipe/framework:packet_generator_cc_proto",
-        "//mediapipe/framework:status_handler_cc_proto",
-        "//mediapipe/framework:stream_handler_cc_proto",
-        "//mediapipe/framework:thread_pool_executor_cc_proto",
         "//mediapipe/framework/port:core_proto",
         "//mediapipe/framework/port:integral_types",
         "//mediapipe/framework/port:logging",
@@ -1202,11 +1202,11 @@ cc_test(
     name = "validated_graph_config_test",
     srcs = ["validated_graph_config_test.cc"],
     deps = [
+        ":calculator_cc_proto",
         ":calculator_framework",
         ":graph_service",
         ":graph_service_manager",
         ":validated_graph_config",
-        "//mediapipe/framework:calculator_cc_proto",
         "//mediapipe/framework/api2:node",
         "//mediapipe/framework/api2:port",
         "//mediapipe/framework/port:gtest_main",
@@ -1233,6 +1233,7 @@ cc_test(
     linkstatic = 1,
     deps = [
         ":calculator_base",
+        ":calculator_cc_proto",
         ":calculator_context",
         ":calculator_context_manager",
         ":calculator_registry",
@@ -1242,7 +1243,6 @@ cc_test(
         ":output_stream_shard",
         ":packet_set",
         ":packet_type",
-        "//mediapipe/framework:calculator_cc_proto",
         "//mediapipe/framework/port:gtest_main",
         "//mediapipe/framework/port:status",
         "//mediapipe/framework/tool:status_util",
@@ -1256,11 +1256,11 @@ cc_test(
     srcs = ["calculator_contract_test.cc"],
     linkstatic = 1,
     deps = [
+        ":calculator_cc_proto",
         ":calculator_contract",
         ":calculator_contract_test_cc_proto",
-        "//mediapipe/framework:calculator_cc_proto",
+        ":packet_generator_cc_proto",
-        "//mediapipe/framework:packet_generator_cc_proto",
+        ":status_handler_cc_proto",
-        "//mediapipe/framework:status_handler_cc_proto",
         "//mediapipe/framework/port:gtest_main",
         "//mediapipe/framework/port:parse_text_proto",
     ],
@@ -1368,6 +1368,7 @@ cc_test(
     srcs = ["calculator_context_test.cc"],
     linkstatic = 1,
     deps = [
+        ":calculator_cc_proto",
         ":calculator_context",
         ":calculator_context_manager",
         ":calculator_state",
@@ -1376,7 +1377,6 @@ cc_test(
         ":output_stream_shard",
         ":packet_set",
         ":packet_type",
-        "//mediapipe/framework:calculator_cc_proto",
         "//mediapipe/framework/port:gtest_main",
         "//mediapipe/framework/port:parse_text_proto",
         "//mediapipe/framework/port:status",
@@ -1403,6 +1403,7 @@ cc_test(
         ":executor",
         ":input_stream_handler",
         ":lifetime_tracker",
+        ":mediapipe_options_cc_proto",
         ":output_stream_poller",
         ":packet_set",
         ":packet_type",
@@ -1410,13 +1411,12 @@ cc_test(
         ":subgraph",
         ":test_calculators",
         ":thread_pool_executor",
+        ":thread_pool_executor_cc_proto",
         ":timestamp",
         ":type_map",
         "//mediapipe/calculators/core:counting_source_calculator",
         "//mediapipe/calculators/core:mux_calculator",
         "//mediapipe/calculators/core:pass_through_calculator",
-        "//mediapipe/framework:mediapipe_options_cc_proto",
-        "//mediapipe/framework:thread_pool_executor_cc_proto",
         "//mediapipe/framework/port:gtest_main",
         "//mediapipe/framework/port:logging",
         "//mediapipe/framework/port:parse_text_proto",
@@ -1481,12 +1481,12 @@ cc_test(
     ],
     visibility = ["//visibility:public"],
     deps = [
+        ":calculator_cc_proto",
         ":calculator_framework",
         ":test_calculators",
         "//mediapipe/calculators/core:counting_source_calculator",
         "//mediapipe/calculators/core:mux_calculator",
         "//mediapipe/calculators/core:pass_through_calculator",
-        "//mediapipe/framework:calculator_cc_proto",
         "//mediapipe/framework/port:gtest_main",
         "//mediapipe/framework/port:logging",
         "//mediapipe/framework/port:parse_text_proto",
@@ -1630,8 +1630,8 @@ cc_test(
     srcs = ["packet_generator_test.cc"],
     deps = [
         ":packet_generator",
+        ":packet_generator_cc_proto",
         ":packet_type",
-        "//mediapipe/framework:packet_generator_cc_proto",
         "//mediapipe/framework/port:gtest_main",
         "//mediapipe/framework/tool:validate_type",
         "@com_google_absl//absl/strings",

mediapipe/framework/formats/BUILD

@@ -26,7 +26,7 @@ licenses(["notice"])
 mediapipe_proto_library(
     name = "detection_proto",
     srcs = ["detection.proto"],
-    deps = ["//mediapipe/framework/formats:location_data_proto"],
+    deps = [":location_data_proto"],
 )
 
 mediapipe_register_type(
@@ -38,7 +38,7 @@ mediapipe_register_type(
         "::std::vector<::mediapipe::Detection>",
         "::std::vector<::mediapipe::DetectionList>",
     ],
-    deps = ["//mediapipe/framework/formats:detection_cc_proto"],
+    deps = [":detection_cc_proto"],
 )
 
 mediapipe_proto_library(
@@ -105,8 +105,8 @@ cc_library(
     srcs = ["matrix.cc"],
     hdrs = ["matrix.h"],
     deps = [
+        ":matrix_data_cc_proto",
         "//mediapipe/framework:port",
-        "//mediapipe/framework/formats:matrix_data_cc_proto",
         "//mediapipe/framework/port:core_proto",
         "//mediapipe/framework/port:logging",
         "//mediapipe/framework/port:ret_check",
@@ -142,7 +142,7 @@ cc_library(
     srcs = ["image_frame.cc"],
     hdrs = ["image_frame.h"],
     deps = [
-        "//mediapipe/framework/formats:image_format_cc_proto",
+        ":image_format_cc_proto",
         "@com_google_absl//absl/base",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/memory",
@@ -166,8 +166,8 @@ cc_library(
     srcs = ["image_frame_opencv.cc"],
     hdrs = ["image_frame_opencv.h"],
     deps = [
+        ":image_format_cc_proto",
         ":image_frame",
-        "//mediapipe/framework/formats:image_format_cc_proto",
         "//mediapipe/framework/port:opencv_core",
     ],
 )
@@ -194,7 +194,7 @@ cc_library(
     deps = [
         "@com_google_protobuf//:protobuf",
         "//mediapipe/framework/formats/annotation:locus_cc_proto",
-        "//mediapipe/framework/formats:location_data_cc_proto",
+        ":location_data_cc_proto",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/memory",
         "@com_google_absl//absl/strings",
@@ -245,7 +245,7 @@ cc_library(
     name = "video_stream_header",
     hdrs = ["video_stream_header.h"],
     deps = [
-        "//mediapipe/framework/formats:image_format_cc_proto",
+        ":image_format_cc_proto",
     ],
 )
 
@@ -263,9 +263,9 @@ cc_test(
     size = "small",
     srcs = ["image_frame_opencv_test.cc"],
     deps = [
+        ":image_format_cc_proto",
         ":image_frame",
         ":image_frame_opencv",
-        "//mediapipe/framework/formats:image_format_cc_proto",
         "//mediapipe/framework/port:gtest_main",
         "//mediapipe/framework/port:integral_types",
         "//mediapipe/framework/port:logging",
@@ -324,8 +324,8 @@ cc_library(
         "//conditions:default": [],
     }),
     deps = [
-        "//mediapipe/framework/formats:image_format_cc_proto",
+        ":image_format_cc_proto",
-        "//mediapipe/framework/formats:image_frame",
+        ":image_frame",
         "@com_google_absl//absl/synchronization",
         "//mediapipe/framework:port",
         "//mediapipe/framework:type_map",
@@ -354,7 +354,7 @@ cc_library(
     hdrs = ["image_multi_pool.h"],
     deps = [
         ":image",
-        "//mediapipe/framework/formats:image_frame_pool",
+        ":image_frame_pool",
         "//mediapipe/framework:port",
         "//mediapipe/framework/port:logging",
         "@com_google_absl//absl/memory",
@@ -390,7 +390,7 @@ cc_library(
     ],
     deps = [
         ":image",
-        "//mediapipe/framework/formats:image_format_cc_proto",
+        ":image_format_cc_proto",
         "//mediapipe/framework/port:logging",
         "//mediapipe/framework/port:opencv_core",
         "//mediapipe/framework/port:statusor",

mediapipe/framework/formats/motion/BUILD

@@ -38,11 +38,11 @@ cc_library(
     srcs = ["optical_flow_field.cc"],
     hdrs = ["optical_flow_field.h"],
     deps = [
+        ":optical_flow_field_data_cc_proto",
         "//mediapipe/framework:type_map",
         "//mediapipe/framework/deps:mathutil",
         "//mediapipe/framework/formats:location",
         "//mediapipe/framework/formats:location_opencv",
-        "//mediapipe/framework/formats/motion:optical_flow_field_data_cc_proto",
         "//mediapipe/framework/port:file_helpers",
         "//mediapipe/framework/port:integral_types",
         "//mediapipe/framework/port:logging",

mediapipe/framework/stream_handler/BUILD

@@ -88,8 +88,8 @@ cc_library(
     srcs = ["default_input_stream_handler.cc"],
     hdrs = ["default_input_stream_handler.h"],
     deps = [
+        ":default_input_stream_handler_cc_proto",
         "//mediapipe/framework:input_stream_handler",
-        "//mediapipe/framework/stream_handler:default_input_stream_handler_cc_proto",
         "@com_google_absl//absl/strings",
     ],
     alwayslink = 1,
@@ -110,8 +110,8 @@ cc_library(
     srcs = ["fixed_size_input_stream_handler.cc"],
     deps = [
         ":default_input_stream_handler",
+        ":fixed_size_input_stream_handler_cc_proto",
         "//mediapipe/framework:input_stream_handler",
-        "//mediapipe/framework/stream_handler:fixed_size_input_stream_handler_cc_proto",
     ],
     alwayslink = 1,
 )
@@ -159,13 +159,13 @@ cc_library(
     name = "sync_set_input_stream_handler",
     srcs = ["sync_set_input_stream_handler.cc"],
     deps = [
+        ":sync_set_input_stream_handler_cc_proto",
         "//mediapipe/framework:collection",
         "//mediapipe/framework:collection_item_id",
         "//mediapipe/framework:input_stream_handler",
         "//mediapipe/framework:mediapipe_options_cc_proto",
         "//mediapipe/framework:packet_set",
         "//mediapipe/framework:timestamp",
-        "//mediapipe/framework/stream_handler:sync_set_input_stream_handler_cc_proto",
         "//mediapipe/framework/tool:tag_map",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/synchronization",
@@ -177,10 +177,10 @@ cc_library(
     name = "timestamp_align_input_stream_handler",
     srcs = ["timestamp_align_input_stream_handler.cc"],
     deps = [
+        ":timestamp_align_input_stream_handler_cc_proto",
         "//mediapipe/framework:collection_item_id",
         "//mediapipe/framework:input_stream_handler",
         "//mediapipe/framework:timestamp",
-        "//mediapipe/framework/stream_handler:timestamp_align_input_stream_handler_cc_proto",
         "//mediapipe/framework/tool:validate_name",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/synchronization",
@@ -243,6 +243,7 @@ cc_test(
     srcs = ["set_input_stream_handler_test.cc"],
     deps = [
         ":fixed_size_input_stream_handler",
+        ":fixed_size_input_stream_handler_cc_proto",
         ":mux_input_stream_handler",
         "//mediapipe/calculators/core:mux_calculator",
         "//mediapipe/calculators/core:pass_through_calculator",
@@ -251,7 +252,6 @@ cc_test(
         "//mediapipe/framework/port:gtest_main",
         "//mediapipe/framework/port:parse_text_proto",
         "//mediapipe/framework/port:ret_check",
-        "//mediapipe/framework/stream_handler:fixed_size_input_stream_handler_cc_proto",
     ],
 )
 
@@ -272,13 +272,13 @@ cc_test(
     srcs = ["fixed_size_input_stream_handler_test.cc"],
     deps = [
         ":fixed_size_input_stream_handler",
+        ":fixed_size_input_stream_handler_cc_proto",
         "//mediapipe/calculators/core:counting_source_calculator",
         "//mediapipe/calculators/core:pass_through_calculator",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework/port:gtest_main",
         "//mediapipe/framework/port:logging",
         "//mediapipe/framework/port:parse_text_proto",
-        "//mediapipe/framework/stream_handler:fixed_size_input_stream_handler_cc_proto",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/synchronization",
     ],
@@ -289,11 +289,11 @@ cc_test(
     srcs = ["sync_set_input_stream_handler_test.cc"],
     deps = [
         ":sync_set_input_stream_handler",
+        ":sync_set_input_stream_handler_cc_proto",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework:test_calculators",
         "//mediapipe/framework/port:gtest_main",
         "//mediapipe/framework/port:parse_text_proto",
-        "//mediapipe/framework/stream_handler:sync_set_input_stream_handler_cc_proto",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/memory",
         "@com_google_absl//absl/strings",

mediapipe/framework/tool/BUILD

@@ -299,6 +299,7 @@ mediapipe_cc_test(
     requires_full_emulation = False,
     deps = [
         ":node_chain_subgraph_cc_proto",
+        ":node_chain_subgraph_options_lib",
         ":options_field_util",
         ":options_registry",
         ":options_syntax_util",
@@ -313,7 +314,6 @@ mediapipe_cc_test(
         "//mediapipe/framework/port:status",
         "//mediapipe/framework/testdata:night_light_calculator_cc_proto",
         "//mediapipe/framework/testdata:night_light_calculator_options_lib",
-        "//mediapipe/framework/tool:node_chain_subgraph_options_lib",
         "//mediapipe/util:header_util",
         "@com_google_absl//absl/strings",
     ],
@@ -422,9 +422,9 @@ cc_library(
     srcs = ["source.cc"],
     visibility = ["//visibility:public"],
     deps = [
+        ":source_cc_proto",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework/port:status",
-        "//mediapipe/framework/tool:source_cc_proto",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/strings",
     ],
@@ -485,13 +485,13 @@ cc_library(
     hdrs = ["template_expander.h"],
     visibility = ["//visibility:public"],
     deps = [
+        ":calculator_graph_template_cc_proto",
         ":proto_util_lite",
         "//mediapipe/framework:calculator_cc_proto",
         "//mediapipe/framework/port:logging",
         "//mediapipe/framework/port:numbers",
         "//mediapipe/framework/port:ret_check",
         "//mediapipe/framework/port:status",
-        "//mediapipe/framework/tool:calculator_graph_template_cc_proto",
         "@com_google_absl//absl/strings",
     ],
 )
@@ -506,6 +506,7 @@ cc_library(
     ],
     visibility = ["//visibility:public"],
     deps = [
+        ":calculator_graph_template_cc_proto",
         ":proto_util_lite",
         "//mediapipe/framework:calculator_cc_proto",
         "//mediapipe/framework/deps:proto_descriptor_cc_proto",
@@ -515,7 +516,6 @@ cc_library(
         "//mediapipe/framework/port:map_util",
         "//mediapipe/framework/port:ret_check",
         "//mediapipe/framework/port:status",
-        "//mediapipe/framework/tool:calculator_graph_template_cc_proto",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/memory",
         "@com_google_absl//absl/strings",
@@ -661,8 +661,8 @@ cc_library(
     hdrs = ["simulation_clock_executor.h"],
     visibility = ["//visibility:public"],
     deps = [
+        ":simulation_clock",
         "//mediapipe/framework:thread_pool_executor",
-        "//mediapipe/framework/tool:simulation_clock",
     ],
 )
 
@@ -789,10 +789,10 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":name_util",
+        ":switch_container_cc_proto",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework/port:ret_check",
         "//mediapipe/framework/port:status",
-        "//mediapipe/framework/tool:switch_container_cc_proto",
     ],
 )
 
@@ -805,6 +805,7 @@ cc_library(
     deps = [
         ":container_util",
         ":options_util",
+        ":switch_container_cc_proto",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework:collection_item_id",
         "//mediapipe/framework/deps:mathutil",
@@ -814,7 +815,6 @@ cc_library(
         "//mediapipe/framework/port:ret_check",
         "//mediapipe/framework/port:status",
         "//mediapipe/framework/stream_handler:immediate_input_stream_handler",
-        "//mediapipe/framework/tool:switch_container_cc_proto",
         "@com_google_absl//absl/strings",
     ],
     alwayslink = 1,
@@ -841,6 +841,7 @@ cc_library(
     ],
     deps = [
         ":container_util",
+        ":switch_container_cc_proto",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework:collection_item_id",
         "//mediapipe/framework:input_stream_shard",
@@ -850,7 +851,6 @@ cc_library(
         "//mediapipe/framework/port:ret_check",
         "//mediapipe/framework/port:status",
         "//mediapipe/framework/stream_handler:immediate_input_stream_handler",
-        "//mediapipe/framework/tool:switch_container_cc_proto",
     ],
     alwayslink = 1,
 )
@@ -893,6 +893,7 @@ cc_library(
         ":container_util",
         ":name_util",
         ":subgraph_expansion",
+        ":switch_container_cc_proto",
         ":switch_demux_calculator",
         ":switch_mux_calculator",
         "//mediapipe/calculators/core:packet_sequencer_calculator",
@@ -904,7 +905,6 @@ cc_library(
         "//mediapipe/framework/port:core_proto",
         "//mediapipe/framework/port:ret_check",
         "//mediapipe/framework/port:status",
-        "//mediapipe/framework/tool:switch_container_cc_proto",
         "@com_google_absl//absl/strings",
     ],
     alwayslink = 1,

mediapipe/gpu/BUILD

@@ -564,6 +564,7 @@ cc_library(
     name = "gpu_shared_data_internal_stub",
     visibility = ["//visibility:private"],
     deps = [
+        ":gl_context_options_cc_proto",
         ":graph_support",
         "//mediapipe/framework:calculator_context",
         "//mediapipe/framework:calculator_node",
@@ -571,7 +572,6 @@ cc_library(
         "//mediapipe/framework:port",
         "//mediapipe/framework/deps:no_destructor",
         "//mediapipe/framework/port:ret_check",
-        "//mediapipe/gpu:gl_context_options_cc_proto",
     ],
 )
 
@@ -592,7 +592,7 @@ cc_library(
     }),
     visibility = ["//visibility:private"],
     deps = [
-        "//mediapipe/gpu:gl_context_options_cc_proto",
+        ":gl_context_options_cc_proto",
         ":graph_support",
         "//mediapipe/framework:calculator_context",
         "//mediapipe/framework:executor",
@@ -833,10 +833,10 @@ cc_library(
     deps = [
         ":gl_base",
         ":gl_simple_shaders",
+        ":scale_mode_cc_proto",
         ":shader_util",
         "//mediapipe/framework/port:ret_check",
         "//mediapipe/framework/port:status",
-        "//mediapipe/gpu:scale_mode_cc_proto",
     ],
 )
 
@@ -907,8 +907,8 @@ proto_library(
     srcs = ["gl_scaler_calculator.proto"],
     visibility = ["//visibility:public"],
     deps = [
+        ":scale_mode_proto",
         "//mediapipe/framework:calculator_proto",
-        "//mediapipe/gpu:scale_mode_proto",
     ],
 )
 
@@ -930,6 +930,7 @@ cc_library(
     deps = [
         ":gl_calculator_helper",
         ":gl_quad_renderer",
+        ":gl_scaler_calculator_cc_proto",
         ":gl_simple_shaders",
         ":shader_util",
         "//mediapipe/framework:calculator_framework",
@@ -937,7 +938,6 @@ cc_library(
         "//mediapipe/framework/port:ret_check",
         "//mediapipe/framework/port:status",
         "//mediapipe/framework/tool:options_util",
-        "//mediapipe/gpu:gl_scaler_calculator_cc_proto",
     ],
     alwayslink = 1,
 )
@@ -950,13 +950,13 @@ cc_library(
         ":egl_surface_holder",
         ":gl_calculator_helper",
         ":gl_quad_renderer",
+        ":gl_surface_sink_calculator_cc_proto",
         ":gpu_buffer",
         ":shader_util",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework/api2:node",
         "//mediapipe/framework/port:ret_check",
         "//mediapipe/framework/port:status",
-        "//mediapipe/gpu:gl_surface_sink_calculator_cc_proto",
         "@com_google_absl//absl/synchronization",
     ],
     alwayslink = 1,
@@ -966,8 +966,8 @@ proto_library(
     name = "gl_surface_sink_calculator_proto",
     srcs = ["gl_surface_sink_calculator.proto"],
     deps = [
+        ":scale_mode_proto",
         "//mediapipe/framework:calculator_proto",
-        "//mediapipe/gpu:scale_mode_proto",
     ],
 )