Internal change

PiperOrigin-RevId: 521483663
2023-04-03 09:43:05 -07:00 · 2023-04-03 09:43:05 -07:00 · e84799ee37
commit e84799ee37
parent cfe91f3c8c
12 changed files with 109 additions and 482 deletions
--- a/mediapipe/calculators/internal/BUILD
+++ b/mediapipe/calculators/internal/BUILD
@ -12,25 +12,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-load("//mediapipe/framework/port:build_config.bzl", "mediapipe_cc_proto_library")
+load("//mediapipe/framework/port:build_config.bzl", "mediapipe_proto_library")

 licenses(["notice"])

 package(default_visibility = ["//visibility:private"])

-proto_library(
+mediapipe_proto_library(
    name = "callback_packet_calculator_proto",
    srcs = ["callback_packet_calculator.proto"],
    visibility = ["//mediapipe/framework:__subpackages__"],
-    deps = ["//mediapipe/framework:calculator_proto"],
-)
-
-mediapipe_cc_proto_library(
-    name = "callback_packet_calculator_cc_proto",
-    srcs = ["callback_packet_calculator.proto"],
-    cc_deps = ["//mediapipe/framework:calculator_cc_proto"],
-    visibility = ["//mediapipe/framework:__subpackages__"],
-    deps = [":callback_packet_calculator_proto"],
+    deps = [
+        "//mediapipe/framework:calculator_options_proto",
+        "//mediapipe/framework:calculator_proto",
+    ],
 )

 cc_library(
--- a/mediapipe/calculators/video/BUILD
+++ b/mediapipe/calculators/video/BUILD
@ -13,7 +13,7 @@
 # limitations under the License.
 #

-load("//mediapipe/framework/port:build_config.bzl", "mediapipe_cc_proto_library")
+load("//mediapipe/framework/port:build_config.bzl", "mediapipe_proto_library")
 load(
    "//mediapipe/framework/tool:mediapipe_graph.bzl",
    "mediapipe_binary_graph",
@ -23,28 +23,35 @@ licenses(["notice"])

 package(default_visibility = ["//visibility:public"])

-proto_library(
+mediapipe_proto_library(
    name = "flow_to_image_calculator_proto",
    srcs = ["flow_to_image_calculator.proto"],
-    deps = ["//mediapipe/framework:calculator_proto"],
+    deps = [
+        "//mediapipe/framework:calculator_options_proto",
+        "//mediapipe/framework:calculator_proto",
+    ],
 )

-proto_library(
+mediapipe_proto_library(
    name = "opencv_video_encoder_calculator_proto",
    srcs = ["opencv_video_encoder_calculator.proto"],
-    deps = ["//mediapipe/framework:calculator_proto"],
+    deps = [
+        "//mediapipe/framework:calculator_options_proto",
+        "//mediapipe/framework:calculator_proto",
+    ],
 )

-proto_library(
+mediapipe_proto_library(
    name = "motion_analysis_calculator_proto",
    srcs = ["motion_analysis_calculator.proto"],
    deps = [
+        "//mediapipe/framework:calculator_options_proto",
        "//mediapipe/framework:calculator_proto",
        "//mediapipe/util/tracking:motion_analysis_proto",
    ],
 )

-proto_library(
+mediapipe_proto_library(
    name = "flow_packager_calculator_proto",
    srcs = ["flow_packager_calculator.proto"],
    deps = [
@ -54,114 +61,45 @@ proto_library(
    ],
 )

-proto_library(
+mediapipe_proto_library(
    name = "box_tracker_calculator_proto",
    srcs = ["box_tracker_calculator.proto"],
    deps = [
+        "//mediapipe/framework:calculator_options_proto",
        "//mediapipe/framework:calculator_proto",
        "//mediapipe/util/tracking:box_tracker_proto",
    ],
 )

-proto_library(
+mediapipe_proto_library(
    name = "tracked_detection_manager_calculator_proto",
    srcs = ["tracked_detection_manager_calculator.proto"],
    deps = [
+        "//mediapipe/framework:calculator_options_proto",
        "//mediapipe/framework:calculator_proto",
        "//mediapipe/util/tracking:tracked_detection_manager_config_proto",
    ],
 )

-proto_library(
+mediapipe_proto_library(
    name = "box_detector_calculator_proto",
    srcs = ["box_detector_calculator.proto"],
    deps = [
+        "//mediapipe/framework:calculator_options_proto",
        "//mediapipe/framework:calculator_proto",
        "//mediapipe/util/tracking:box_detector_proto",
    ],
 )

-proto_library(
+mediapipe_proto_library(
    name = "video_pre_stream_calculator_proto",
    srcs = ["video_pre_stream_calculator.proto"],
    deps = [
+        "//mediapipe/framework:calculator_options_proto",
        "//mediapipe/framework:calculator_proto",
    ],
 )

-mediapipe_cc_proto_library(
-    name = "motion_analysis_calculator_cc_proto",
-    srcs = ["motion_analysis_calculator.proto"],
-    cc_deps = [
-        "//mediapipe/framework:calculator_cc_proto",
-        "//mediapipe/util/tracking:motion_analysis_cc_proto",
-    ],
-    deps = [":motion_analysis_calculator_proto"],
-)
-
-mediapipe_cc_proto_library(
-    name = "flow_packager_calculator_cc_proto",
-    srcs = ["flow_packager_calculator.proto"],
-    cc_deps = [
-        "//mediapipe/framework:calculator_cc_proto",
-        "//mediapipe/util/tracking:flow_packager_cc_proto",
-    ],
-    deps = [":flow_packager_calculator_proto"],
-)
-
-mediapipe_cc_proto_library(
-    name = "box_tracker_calculator_cc_proto",
-    srcs = ["box_tracker_calculator.proto"],
-    cc_deps = [
-        "//mediapipe/framework:calculator_cc_proto",
-        "//mediapipe/util/tracking:box_tracker_cc_proto",
-    ],
-    deps = [":box_tracker_calculator_proto"],
-)
-
-mediapipe_cc_proto_library(
-    name = "tracked_detection_manager_calculator_cc_proto",
-    srcs = ["tracked_detection_manager_calculator.proto"],
-    cc_deps = [
-        "//mediapipe/framework:calculator_cc_proto",
-        "//mediapipe/util/tracking:tracked_detection_manager_config_cc_proto",
-    ],
-    deps = [":tracked_detection_manager_calculator_proto"],
-)
-
-mediapipe_cc_proto_library(
-    name = "box_detector_calculator_cc_proto",
-    srcs = ["box_detector_calculator.proto"],
-    cc_deps = [
-        "//mediapipe/framework:calculator_cc_proto",
-        "//mediapipe/util/tracking:box_detector_cc_proto",
-    ],
-    deps = [":box_detector_calculator_proto"],
-)
-
-mediapipe_cc_proto_library(
-    name = "video_pre_stream_calculator_cc_proto",
-    srcs = ["video_pre_stream_calculator.proto"],
-    cc_deps = [
-        "//mediapipe/framework:calculator_cc_proto",
-    ],
-    deps = [":video_pre_stream_calculator_proto"],
-)
-
-mediapipe_cc_proto_library(
-    name = "flow_to_image_calculator_cc_proto",
-    srcs = ["flow_to_image_calculator.proto"],
-    cc_deps = ["//mediapipe/framework:calculator_cc_proto"],
-    deps = [":flow_to_image_calculator_proto"],
-)
-
-mediapipe_cc_proto_library(
-    name = "opencv_video_encoder_calculator_cc_proto",
-    srcs = ["opencv_video_encoder_calculator.proto"],
-    cc_deps = ["//mediapipe/framework:calculator_cc_proto"],
-    deps = [":opencv_video_encoder_calculator_proto"],
-)
-
 cc_library(
    name = "flow_to_image_calculator",
    srcs = ["flow_to_image_calculator.cc"],
--- a/mediapipe/examples/desktop/autoflip/BUILD
+++ b/mediapipe/examples/desktop/autoflip/BUILD
@ -1,4 +1,4 @@
-load("//mediapipe/framework/port:build_config.bzl", "mediapipe_cc_proto_library")
+load("//mediapipe/framework/port:build_config.bzl", "mediapipe_proto_library")

 # Copyright 2019 The MediaPipe Authors.
 #
@ -22,7 +22,7 @@ package(default_visibility = [
    "//photos/editing/mobile/mediapipe/proto:__subpackages__",
 ])

-proto_library(
+mediapipe_proto_library(
    name = "autoflip_messages_proto",
    srcs = ["autoflip_messages.proto"],
    deps = [
@ -30,29 +30,6 @@ proto_library(
    ],
 )

-java_lite_proto_library(
-    name = "autoflip_messages_java_proto_lite",
-    visibility = [
-        "//java/com/google/android/apps/photos:__subpackages__",
-        "//javatests/com/google/android/apps/photos:__subpackages__",
-    ],
-    deps = [
-        ":autoflip_messages_proto",
-    ],
-)
-
-mediapipe_cc_proto_library(
-    name = "autoflip_messages_cc_proto",
-    srcs = ["autoflip_messages.proto"],
-    cc_deps = ["//mediapipe/framework:calculator_cc_proto"],
-    visibility = [
-        "//mediapipe/examples:__subpackages__",
-        "//photos/editing/mobile/mediapipe/calculators:__pkg__",
-        "//photos/editing/mobile/mediapipe/calculators:__subpackages__",
-    ],
-    deps = [":autoflip_messages_proto"],
-)
-
 cc_binary(
    name = "run_autoflip",
    data = [
--- a/mediapipe/examples/desktop/autoflip/calculators/BUILD
+++ b/mediapipe/examples/desktop/autoflip/calculators/BUILD
@ -1,4 +1,4 @@
-load("//mediapipe/framework/port:build_config.bzl", "mediapipe_cc_proto_library")
+load("//mediapipe/framework/port:build_config.bzl", "mediapipe_proto_library")

 # Copyright 2019 The MediaPipe Authors.
 #
@ -40,22 +40,16 @@ cc_library(
    alwayslink = 1,
 )

-proto_library(
+mediapipe_proto_library(
    name = "border_detection_calculator_proto",
    srcs = ["border_detection_calculator.proto"],
+    visibility = ["//mediapipe/examples:__subpackages__"],
    deps = [
+        "//mediapipe/framework:calculator_options_proto",
        "//mediapipe/framework:calculator_proto",
    ],
 )

-mediapipe_cc_proto_library(
-    name = "border_detection_calculator_cc_proto",
-    srcs = ["border_detection_calculator.proto"],
-    cc_deps = ["//mediapipe/framework:calculator_cc_proto"],
-    visibility = ["//mediapipe/examples:__subpackages__"],
-    deps = [":border_detection_calculator_proto"],
-)
-
 cc_library(
    name = "content_zooming_calculator_state",
    hdrs = ["content_zooming_calculator_state.h"],
@ -85,27 +79,16 @@ cc_library(
    alwayslink = 1,
 )

-proto_library(
+mediapipe_proto_library(
    name = "content_zooming_calculator_proto",
    srcs = ["content_zooming_calculator.proto"],
-    deps = [
-        "//mediapipe/examples/desktop/autoflip/quality:kinematic_path_solver_proto",
-        "//mediapipe/framework:calculator_proto",
-    ],
-)
-
-mediapipe_cc_proto_library(
-    name = "content_zooming_calculator_cc_proto",
-    srcs = ["content_zooming_calculator.proto"],
-    cc_deps = [
-        "//mediapipe/examples/desktop/autoflip/quality:kinematic_path_solver_cc_proto",
-        "//mediapipe/framework:calculator_cc_proto",
-    ],
    visibility = [
        "//mediapipe/examples:__subpackages__",
    ],
    deps = [
-        ":content_zooming_calculator_proto",
+        "//mediapipe/examples/desktop/autoflip/quality:kinematic_path_solver_proto",
+        "//mediapipe/framework:calculator_options_proto",
+        "//mediapipe/framework:calculator_proto",
    ],
 )

@ -177,23 +160,16 @@ cc_library(
    alwayslink = 1,
 )

-proto_library(
+mediapipe_proto_library(
    name = "video_filtering_calculator_proto",
    srcs = ["video_filtering_calculator.proto"],
    visibility = ["//visibility:public"],
    deps = [
+        "//mediapipe/framework:calculator_options_proto",
        "//mediapipe/framework:calculator_proto",
    ],
 )

-mediapipe_cc_proto_library(
-    name = "video_filtering_calculator_cc_proto",
-    srcs = ["video_filtering_calculator.proto"],
-    cc_deps = ["//mediapipe/framework:calculator_cc_proto"],
-    visibility = ["//visibility:public"],
-    deps = [":video_filtering_calculator_proto"],
-)
-
 cc_test(
    name = "video_filtering_calculator_test",
    srcs = ["video_filtering_calculator_test.cc"],
@ -209,27 +185,17 @@ cc_test(
    ],
 )

-proto_library(
+mediapipe_proto_library(
    name = "scene_cropping_calculator_proto",
    srcs = ["scene_cropping_calculator.proto"],
    visibility = ["//visibility:public"],
    deps = [
        "//mediapipe/examples/desktop/autoflip/quality:cropping_proto",
+        "//mediapipe/framework:calculator_options_proto",
        "//mediapipe/framework:calculator_proto",
    ],
 )

-mediapipe_cc_proto_library(
-    name = "scene_cropping_calculator_cc_proto",
-    srcs = ["scene_cropping_calculator.proto"],
-    cc_deps = [
-        "//mediapipe/examples/desktop/autoflip/quality:cropping_cc_proto",
-        "//mediapipe/framework:calculator_cc_proto",
-    ],
-    visibility = ["//visibility:public"],
-    deps = [":scene_cropping_calculator_proto"],
-)
-
 cc_library(
    name = "scene_cropping_calculator",
    srcs = ["scene_cropping_calculator.cc"],
@ -296,26 +262,17 @@ cc_library(
    alwayslink = 1,
 )

-proto_library(
+mediapipe_proto_library(
    name = "signal_fusing_calculator_proto",
    srcs = ["signal_fusing_calculator.proto"],
+    visibility = ["//mediapipe/examples:__subpackages__"],
    deps = [
        "//mediapipe/examples/desktop/autoflip:autoflip_messages_proto",
+        "//mediapipe/framework:calculator_options_proto",
        "//mediapipe/framework:calculator_proto",
    ],
 )

-mediapipe_cc_proto_library(
-    name = "signal_fusing_calculator_cc_proto",
-    srcs = ["signal_fusing_calculator.proto"],
-    cc_deps = [
-        "//mediapipe/examples/desktop/autoflip:autoflip_messages_cc_proto",
-        "//mediapipe/framework:calculator_cc_proto",
-    ],
-    visibility = ["//mediapipe/examples:__subpackages__"],
-    deps = [":signal_fusing_calculator_proto"],
-)
-
 cc_test(
    name = "signal_fusing_calculator_test",
    srcs = ["signal_fusing_calculator_test.cc"],
@ -353,18 +310,14 @@ cc_library(
    alwayslink = 1,
 )

-proto_library(
+mediapipe_proto_library(
    name = "shot_boundary_calculator_proto",
    srcs = ["shot_boundary_calculator.proto"],
-    deps = ["//mediapipe/framework:calculator_proto"],
-)
-
-mediapipe_cc_proto_library(
-    name = "shot_boundary_calculator_cc_proto",
-    srcs = ["shot_boundary_calculator.proto"],
-    cc_deps = ["//mediapipe/framework:calculator_cc_proto"],
    visibility = ["//mediapipe/examples:__subpackages__"],
-    deps = [":shot_boundary_calculator_proto"],
+    deps = [
+        "//mediapipe/framework:calculator_options_proto",
+        "//mediapipe/framework:calculator_proto",
+    ],
 )

 cc_test(
@ -413,26 +366,17 @@ cc_library(
    alwayslink = 1,
 )

-proto_library(
+mediapipe_proto_library(
    name = "face_to_region_calculator_proto",
    srcs = ["face_to_region_calculator.proto"],
+    visibility = ["//mediapipe/examples:__subpackages__"],
    deps = [
        "//mediapipe/examples/desktop/autoflip/quality:visual_scorer_proto",
+        "//mediapipe/framework:calculator_options_proto",
        "//mediapipe/framework:calculator_proto",
    ],
 )

-mediapipe_cc_proto_library(
-    name = "face_to_region_calculator_cc_proto",
-    srcs = ["face_to_region_calculator.proto"],
-    cc_deps = [
-        "//mediapipe/examples/desktop/autoflip/quality:visual_scorer_cc_proto",
-        "//mediapipe/framework:calculator_cc_proto",
-    ],
-    visibility = ["//mediapipe/examples:__subpackages__"],
-    deps = [":face_to_region_calculator_proto"],
-)
-
 cc_test(
    name = "face_to_region_calculator_test",
    srcs = ["face_to_region_calculator_test.cc"],
@ -454,22 +398,16 @@ cc_test(
    ],
 )

-proto_library(
+mediapipe_proto_library(
    name = "localization_to_region_calculator_proto",
    srcs = ["localization_to_region_calculator.proto"],
+    visibility = ["//mediapipe/examples:__subpackages__"],
    deps = [
+        "//mediapipe/framework:calculator_options_proto",
        "//mediapipe/framework:calculator_proto",
    ],
 )

-mediapipe_cc_proto_library(
-    name = "localization_to_region_calculator_cc_proto",
-    srcs = ["localization_to_region_calculator.proto"],
-    cc_deps = ["//mediapipe/framework:calculator_cc_proto"],
-    visibility = ["//mediapipe/examples:__subpackages__"],
-    deps = [":localization_to_region_calculator_proto"],
-)
-
 cc_library(
    name = "localization_to_region_calculator",
    srcs = ["localization_to_region_calculator.cc"],
--- a/mediapipe/examples/desktop/autoflip/quality/BUILD
+++ b/mediapipe/examples/desktop/autoflip/quality/BUILD
@ -1,4 +1,4 @@
-load("//mediapipe/framework/port:build_config.bzl", "mediapipe_cc_proto_library")
+load("//mediapipe/framework/port:build_config.bzl", "mediapipe_proto_library")

 # Copyright 2019 The MediaPipe Authors.
 #
@ -20,7 +20,7 @@ package(default_visibility = [
    "//mediapipe/examples:__subpackages__",
 ])

-proto_library(
+mediapipe_proto_library(
    name = "cropping_proto",
    srcs = ["cropping.proto"],
    deps = [
@ -29,41 +29,18 @@ proto_library(
    ],
 )

-mediapipe_cc_proto_library(
-    name = "cropping_cc_proto",
-    srcs = ["cropping.proto"],
-    cc_deps = [
-        ":kinematic_path_solver_cc_proto",
-        "//mediapipe/examples/desktop/autoflip:autoflip_messages_cc_proto",
-    ],
-    visibility = ["//mediapipe/examples:__subpackages__"],
-    deps = [":cropping_proto"],
-)
-
-proto_library(
+mediapipe_proto_library(
    name = "kinematic_path_solver_proto",
    srcs = ["kinematic_path_solver.proto"],
-)
-
-mediapipe_cc_proto_library(
-    name = "kinematic_path_solver_cc_proto",
-    srcs = ["kinematic_path_solver.proto"],
    visibility = [
        "//mediapipe/examples:__subpackages__",
    ],
-    deps = [":kinematic_path_solver_proto"],
 )

-proto_library(
+mediapipe_proto_library(
    name = "focus_point_proto",
    srcs = ["focus_point.proto"],
-)
-
-mediapipe_cc_proto_library(
-    name = "focus_point_cc_proto",
-    srcs = ["focus_point.proto"],
    visibility = ["//mediapipe/examples:__subpackages__"],
-    deps = [":focus_point_proto"],
 )

 cc_library(
@ -333,16 +310,10 @@ cc_test(
    ],
 )

-proto_library(
+mediapipe_proto_library(
    name = "visual_scorer_proto",
    srcs = ["visual_scorer.proto"],
-)
-
-mediapipe_cc_proto_library(
-    name = "visual_scorer_cc_proto",
-    srcs = ["visual_scorer.proto"],
    visibility = ["//mediapipe/examples:__subpackages__"],
-    deps = [":visual_scorer_proto"],
 )

 cc_library(
--- a/mediapipe/framework/formats/motion/BUILD
+++ b/mediapipe/framework/formats/motion/BUILD
@ -16,23 +16,17 @@
 # Description:
 #   Working with dense optical flow in mediapipe.

-load("//mediapipe/framework/port:build_config.bzl", "mediapipe_cc_proto_library")
+load("//mediapipe/framework/port:build_config.bzl", "mediapipe_proto_library")

 licenses(["notice"])

 package(default_visibility = ["//visibility:public"])

-proto_library(
+mediapipe_proto_library(
    name = "optical_flow_field_data_proto",
    srcs = ["optical_flow_field_data.proto"],
 )

-mediapipe_cc_proto_library(
-    name = "optical_flow_field_data_cc_proto",
-    srcs = ["optical_flow_field_data.proto"],
-    deps = [":optical_flow_field_data_proto"],
-)
-
 cc_library(
    name = "optical_flow_field",
    srcs = ["optical_flow_field.cc"],
--- a/mediapipe/framework/stream_handler/BUILD
+++ b/mediapipe/framework/stream_handler/BUILD
@ -13,7 +13,7 @@
 # limitations under the License.
 #

-load("//mediapipe/framework/port:build_config.bzl", "mediapipe_cc_proto_library")
+load("//mediapipe/framework/port:build_config.bzl", "mediapipe_proto_library")

 licenses(["notice"])

@ -22,56 +22,32 @@ package(
    features = ["-layering_check"],
 )

-proto_library(
+mediapipe_proto_library(
    name = "default_input_stream_handler_proto",
    srcs = ["default_input_stream_handler.proto"],
    deps = ["//mediapipe/framework:mediapipe_options_proto"],
+    alwayslink = 1,
 )

-proto_library(
+mediapipe_proto_library(
    name = "fixed_size_input_stream_handler_proto",
    srcs = ["fixed_size_input_stream_handler.proto"],
    deps = ["//mediapipe/framework:mediapipe_options_proto"],
+    alwayslink = 1,
 )

-proto_library(
+mediapipe_proto_library(
    name = "sync_set_input_stream_handler_proto",
    srcs = ["sync_set_input_stream_handler.proto"],
    deps = ["//mediapipe/framework:mediapipe_options_proto"],
+    alwayslink = 1,
 )

-proto_library(
+mediapipe_proto_library(
    name = "timestamp_align_input_stream_handler_proto",
    srcs = ["timestamp_align_input_stream_handler.proto"],
    deps = ["//mediapipe/framework:mediapipe_options_proto"],
-)
-
-mediapipe_cc_proto_library(
-    name = "default_input_stream_handler_cc_proto",
-    srcs = ["default_input_stream_handler.proto"],
-    cc_deps = ["//mediapipe/framework:mediapipe_options_cc_proto"],
-    deps = [":default_input_stream_handler_proto"],
-)
-
-mediapipe_cc_proto_library(
-    name = "fixed_size_input_stream_handler_cc_proto",
-    srcs = ["fixed_size_input_stream_handler.proto"],
-    cc_deps = ["//mediapipe/framework:mediapipe_options_cc_proto"],
-    deps = [":fixed_size_input_stream_handler_proto"],
-)
-
-mediapipe_cc_proto_library(
-    name = "sync_set_input_stream_handler_cc_proto",
-    srcs = ["sync_set_input_stream_handler.proto"],
-    cc_deps = ["//mediapipe/framework:mediapipe_options_cc_proto"],
-    deps = [":sync_set_input_stream_handler_proto"],
-)
-
-mediapipe_cc_proto_library(
-    name = "timestamp_align_input_stream_handler_cc_proto",
-    srcs = ["timestamp_align_input_stream_handler.proto"],
-    cc_deps = ["//mediapipe/framework:mediapipe_options_cc_proto"],
-    deps = [":timestamp_align_input_stream_handler_proto"],
+    alwayslink = 1,
 )

 cc_library(
--- a/mediapipe/framework/tool/mediapipe_proto.bzl
+++ b/mediapipe/framework/tool/mediapipe_proto.bzl
@ -90,7 +90,6 @@ def mediapipe_proto_library_impl(
            visibility = visibility,
            testonly = testonly,
            compatible_with = compatible_with,
-            alwayslink = alwayslink,
        ))

    if def_cc_proto:
--- a/mediapipe/gpu/BUILD
+++ b/mediapipe/gpu/BUILD
@ -15,7 +15,7 @@
 load("@bazel_skylib//lib:selects.bzl", "selects")
 load("//mediapipe/gpu:metal.bzl", "metal_library")
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test")
-load("//mediapipe/framework/port:build_config.bzl", "mediapipe_cc_proto_library", "mediapipe_proto_library")
+load("//mediapipe/framework/port:build_config.bzl", "mediapipe_proto_library")
 load("//mediapipe/framework:mediapipe_cc_test.bzl", "mediapipe_cc_test")
 load("//mediapipe/framework:more_selects.bzl", "more_selects")

@ -555,7 +555,10 @@ mediapipe_proto_library(
    name = "gl_context_options_proto",
    srcs = ["gl_context_options.proto"],
    visibility = ["//visibility:public"],
-    deps = ["//mediapipe/framework:calculator_proto"],
+    deps = [
+        "//mediapipe/framework:calculator_options_proto",
+        "//mediapipe/framework:calculator_proto",
+    ],
 )

 # This is a hack needed to work around some issues with strict hdrs_check.
@ -929,6 +932,7 @@ mediapipe_proto_library(
    srcs = ["gl_animation_overlay_calculator.proto"],
    visibility = ["//visibility:public"],
    deps = [
+        "//mediapipe/framework:calculator_options_proto",
        "//mediapipe/framework:calculator_proto",
    ],
 )
@ -939,6 +943,7 @@ mediapipe_proto_library(
    visibility = ["//visibility:public"],
    deps = [
        ":scale_mode_proto",
+        "//mediapipe/framework:calculator_options_proto",
        "//mediapipe/framework:calculator_proto",
    ],
 )
@ -982,26 +987,16 @@ cc_library(
    alwayslink = 1,
 )

-proto_library(
+mediapipe_proto_library(
    name = "gl_surface_sink_calculator_proto",
    srcs = ["gl_surface_sink_calculator.proto"],
    deps = [
        ":scale_mode_proto",
+        "//mediapipe/framework:calculator_options_proto",
        "//mediapipe/framework:calculator_proto",
    ],
 )

-mediapipe_cc_proto_library(
-    name = "gl_surface_sink_calculator_cc_proto",
-    srcs = ["gl_surface_sink_calculator.proto"],
-    cc_deps = [
-        ":scale_mode_cc_proto",
-        "//mediapipe/framework:calculator_cc_proto",
-    ],
-    visibility = ["//visibility:public"],
-    deps = [":gl_surface_sink_calculator_proto"],
-)
-
 ### Metal calculators

 metal_library(
@ -1017,21 +1012,14 @@ objc_library(
    deps = [":simple_shaders_mtl"],
 )

-proto_library(
+mediapipe_proto_library(
    name = "copy_calculator_proto",
    srcs = ["copy_calculator.proto"],
    visibility = ["//visibility:public"],
-    deps = ["//mediapipe/framework:calculator_proto"],
-)
-
-mediapipe_cc_proto_library(
-    name = "copy_calculator_cc_proto",
-    srcs = ["copy_calculator.proto"],
-    cc_deps = [
-        "//mediapipe/framework:calculator_cc_proto",
+    deps = [
+        "//mediapipe/framework:calculator_options_proto",
+        "//mediapipe/framework:calculator_proto",
    ],
-    visibility = ["//visibility:public"],
-    deps = [":copy_calculator_proto"],
 )

 objc_library(
--- a/mediapipe/graphs/iris_tracking/calculators/BUILD
+++ b/mediapipe/graphs/iris_tracking/calculators/BUILD
@ -12,33 +12,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-load("//mediapipe/framework/port:build_config.bzl", "mediapipe_cc_proto_library")
+load("//mediapipe/framework/port:build_config.bzl", "mediapipe_proto_library")

 licenses(["notice"])

-proto_library(
+mediapipe_proto_library(
    name = "iris_to_render_data_calculator_proto",
    srcs = ["iris_to_render_data_calculator.proto"],
    visibility = ["//visibility:public"],
    deps = [
+        "//mediapipe/framework:calculator_options_proto",
        "//mediapipe/framework:calculator_proto",
        "//mediapipe/util:color_proto",
        "//mediapipe/util:render_data_proto",
    ],
 )

-mediapipe_cc_proto_library(
-    name = "iris_to_render_data_calculator_cc_proto",
-    srcs = ["iris_to_render_data_calculator.proto"],
-    cc_deps = [
-        "//mediapipe/framework:calculator_cc_proto",
-        "//mediapipe/util:color_cc_proto",
-        "//mediapipe/util:render_data_cc_proto",
-    ],
-    visibility = ["//visibility:public"],
-    deps = [":iris_to_render_data_calculator_proto"],
-)
-
 cc_library(
    name = "iris_to_render_data_calculator",
    srcs = ["iris_to_render_data_calculator.cc"],
@ -56,25 +45,16 @@ cc_library(
    alwayslink = 1,
 )

-proto_library(
+mediapipe_proto_library(
    name = "iris_to_depth_calculator_proto",
    srcs = ["iris_to_depth_calculator.proto"],
    visibility = ["//visibility:public"],
    deps = [
+        "//mediapipe/framework:calculator_options_proto",
        "//mediapipe/framework:calculator_proto",
    ],
 )

-mediapipe_cc_proto_library(
-    name = "iris_to_depth_calculator_cc_proto",
-    srcs = ["iris_to_depth_calculator.proto"],
-    cc_deps = [
-        "//mediapipe/framework:calculator_cc_proto",
-    ],
-    visibility = ["//visibility:public"],
-    deps = [":iris_to_depth_calculator_proto"],
-)
-
 cc_library(
    name = "iris_to_depth_calculator",
    srcs = ["iris_to_depth_calculator.cc"],
--- a/mediapipe/util/tracking/BUILD
+++ b/mediapipe/util/tracking/BUILD
@ -13,24 +13,24 @@
 # limitations under the License.
 #

-load("//mediapipe/framework/port:build_config.bzl", "mediapipe_cc_proto_library")
+load("//mediapipe/framework/port:build_config.bzl", "mediapipe_proto_library")

 licenses(["notice"])

 package(default_visibility = ["//visibility:public"])

-proto_library(
+mediapipe_proto_library(
    name = "tone_models_proto",
    srcs = ["tone_models.proto"],
 )

-proto_library(
+mediapipe_proto_library(
    name = "tone_estimation_proto",
    srcs = ["tone_estimation.proto"],
    deps = [":tone_models_proto"],
 )

-proto_library(
+mediapipe_proto_library(
    name = "region_flow_computation_proto",
    srcs = ["region_flow_computation.proto"],
    deps = [
@ -38,17 +38,17 @@ proto_library(
    ],
 )

-proto_library(
+mediapipe_proto_library(
    name = "motion_saliency_proto",
    srcs = ["motion_saliency.proto"],
 )

-proto_library(
+mediapipe_proto_library(
    name = "motion_estimation_proto",
    srcs = ["motion_estimation.proto"],
 )

-proto_library(
+mediapipe_proto_library(
    name = "motion_analysis_proto",
    srcs = ["motion_analysis.proto"],
    deps = [
@ -58,33 +58,33 @@ proto_library(
    ],
 )

-proto_library(
+mediapipe_proto_library(
    name = "region_flow_proto",
    srcs = ["region_flow.proto"],
 )

-proto_library(
+mediapipe_proto_library(
    name = "motion_models_proto",
    srcs = ["motion_models.proto"],
 )

-proto_library(
+mediapipe_proto_library(
    name = "camera_motion_proto",
    srcs = ["camera_motion.proto"],
    deps = [":motion_models_proto"],
 )

-proto_library(
+mediapipe_proto_library(
    name = "push_pull_filtering_proto",
    srcs = ["push_pull_filtering.proto"],
 )

-proto_library(
+mediapipe_proto_library(
    name = "frame_selection_solution_evaluator_proto",
    srcs = ["frame_selection_solution_evaluator.proto"],
 )

-proto_library(
+mediapipe_proto_library(
    name = "frame_selection_proto",
    srcs = ["frame_selection.proto"],
    deps = [
@ -94,7 +94,7 @@ proto_library(
    ],
 )

-proto_library(
+mediapipe_proto_library(
    name = "flow_packager_proto",
    srcs = ["flow_packager.proto"],
    deps = [
@ -103,7 +103,7 @@ proto_library(
    ],
 )

-proto_library(
+mediapipe_proto_library(
    name = "tracking_proto",
    srcs = ["tracking.proto"],
    deps = [
@ -111,18 +111,18 @@ proto_library(
    ],
 )

-proto_library(
+mediapipe_proto_library(
    name = "box_tracker_proto",
    srcs = ["box_tracker.proto"],
    deps = [":tracking_proto"],
 )

-proto_library(
+mediapipe_proto_library(
    name = "tracked_detection_manager_config_proto",
    srcs = ["tracked_detection_manager_config.proto"],
 )

-proto_library(
+mediapipe_proto_library(
    name = "box_detector_proto",
    srcs = ["box_detector.proto"],
    deps = [
@ -131,135 +131,6 @@ proto_library(
    ],
 )

-mediapipe_cc_proto_library(
-    name = "tone_models_cc_proto",
-    srcs = ["tone_models.proto"],
-    deps = [":tone_models_proto"],
-)
-
-mediapipe_cc_proto_library(
-    name = "tone_estimation_cc_proto",
-    srcs = ["tone_estimation.proto"],
-    cc_deps = [":tone_models_cc_proto"],
-    deps = [":tone_estimation_proto"],
-)
-
-mediapipe_cc_proto_library(
-    name = "region_flow_computation_cc_proto",
-    srcs = ["region_flow_computation.proto"],
-    cc_deps = [
-        ":tone_estimation_cc_proto",
-        ":tone_models_cc_proto",
-    ],
-    deps = [":region_flow_computation_proto"],
-)
-
-mediapipe_cc_proto_library(
-    name = "motion_saliency_cc_proto",
-    srcs = ["motion_saliency.proto"],
-    deps = [":motion_saliency_proto"],
-)
-
-mediapipe_cc_proto_library(
-    name = "motion_estimation_cc_proto",
-    srcs = ["motion_estimation.proto"],
-    deps = [":motion_estimation_proto"],
-)
-
-mediapipe_cc_proto_library(
-    name = "motion_analysis_cc_proto",
-    srcs = ["motion_analysis.proto"],
-    cc_deps = [
-        ":motion_estimation_cc_proto",
-        ":motion_saliency_cc_proto",
-        ":region_flow_computation_cc_proto",
-    ],
-    deps = [":motion_analysis_proto"],
-)
-
-mediapipe_cc_proto_library(
-    name = "region_flow_cc_proto",
-    srcs = ["region_flow.proto"],
-    cc_deps = [":motion_models_cc_proto"],
-    deps = [":region_flow_proto"],
-)
-
-mediapipe_cc_proto_library(
-    name = "motion_models_cc_proto",
-    srcs = ["motion_models.proto"],
-    deps = [":motion_models_proto"],
-)
-
-mediapipe_cc_proto_library(
-    name = "camera_motion_cc_proto",
-    srcs = ["camera_motion.proto"],
-    cc_deps = [":motion_models_cc_proto"],
-    deps = [":camera_motion_proto"],
-)
-
-mediapipe_cc_proto_library(
-    name = "push_pull_filtering_cc_proto",
-    srcs = ["push_pull_filtering.proto"],
-    deps = [":push_pull_filtering_proto"],
-)
-
-mediapipe_cc_proto_library(
-    name = "frame_selection_solution_evaluator_cc_proto",
-    srcs = ["frame_selection_solution_evaluator.proto"],
-    deps = [":frame_selection_solution_evaluator_proto"],
-)
-
-mediapipe_cc_proto_library(
-    name = "frame_selection_cc_proto",
-    srcs = ["frame_selection.proto"],
-    cc_deps = [
-        ":camera_motion_cc_proto",
-        ":frame_selection_solution_evaluator_cc_proto",
-        ":region_flow_cc_proto",
-    ],
-    deps = [":frame_selection_proto"],
-)
-
-mediapipe_cc_proto_library(
-    name = "flow_packager_cc_proto",
-    srcs = ["flow_packager.proto"],
-    cc_deps = [
-        ":motion_models_cc_proto",
-        ":region_flow_cc_proto",
-    ],
-    deps = [":flow_packager_proto"],
-)
-
-mediapipe_cc_proto_library(
-    name = "tracking_cc_proto",
-    srcs = ["tracking.proto"],
-    cc_deps = [":motion_models_cc_proto"],
-    deps = [":tracking_proto"],
-)
-
-mediapipe_cc_proto_library(
-    name = "box_tracker_cc_proto",
-    srcs = ["box_tracker.proto"],
-    cc_deps = [":tracking_cc_proto"],
-    deps = [":box_tracker_proto"],
-)
-
-mediapipe_cc_proto_library(
-    name = "tracked_detection_manager_config_cc_proto",
-    srcs = ["tracked_detection_manager_config.proto"],
-    deps = [":tracked_detection_manager_config_proto"],
-)
-
-mediapipe_cc_proto_library(
-    name = "box_detector_cc_proto",
-    srcs = ["box_detector.proto"],
-    cc_deps = [
-        ":box_tracker_cc_proto",
-        ":region_flow_cc_proto",
-    ],
-    deps = [":box_detector_proto"],
-)
-
 cc_library(
    name = "motion_models",
    srcs = ["motion_models.cc"],
--- a/third_party/halide.BUILD
+++ b/third_party/halide.BUILD
@ -43,8 +43,8 @@ cc_library(
    name = "lib_halide_static",
    srcs = select({
        "@halide//:halide_config_windows_x86_64": [
-            "lib/Release/Halide.lib",
            "bin/Release/Halide.dll",
+            "lib/Release/Halide.lib",
        ],
        "//conditions:default": [
            "lib/libHalide.a",