Synchronize new proto/yaml changes.

PiperOrigin-RevId: 222302153

google/api/BUILD.bazel

@@ -5,50 +5,163 @@ package(default_visibility = ["//visibility:public"])
 # Common
 ##############################################################################
 proto_library(
-    name = "api_proto",
-    srcs = [
-        "annotations.proto",
-        "auth.proto",
-        "backend.proto",
-        "billing.proto",
-        "config_change.proto",
-        "consumer.proto",
-        "context.proto",
-        "control.proto",
-        "distribution.proto",
-        "documentation.proto",
-        "endpoint.proto",
-        "http.proto",
-        "httpbody.proto",
-        "label.proto",
-        "launch_stage.proto",
-        "log.proto",
-        "logging.proto",
-        "metric.proto",
-        "monitored_resource.proto",
-        "monitoring.proto",
-        "quota.proto",
-        "source_info.proto",
-        "system_parameter.proto",
-        "usage.proto",
+    name = "annotations_proto",
+    srcs = ["annotations.proto"],
+    deps = [
+        ":http_proto",
+        "@com_google_protobuf//:descriptor_proto",
     ],
+)
+
+proto_library(
+    name = "auth_proto",
+    srcs = ["auth.proto"],
+    deps = [":annotations_proto"],
+)
+
+proto_library(
+    name = "backend_proto",
+    srcs = ["backend.proto"],
+)
+
+proto_library(
+    name = "billing_proto",
+    srcs = ["billing.proto"],
     deps = [
+        ":annotations_proto",
+        ":metric_proto",
+    ],
+)
+
+proto_library(
+    name = "config_change_proto",
+    srcs = ["config_change.proto"],
+)
+
+proto_library(
+    name = "consumer_proto",
+    srcs = ["consumer.proto"],
+)
+
+proto_library(
+    name = "context_proto",
+    srcs = ["context.proto"],
+)
+
+proto_library(
+    name = "control_proto",
+    srcs = ["control.proto"],
+)
+
+proto_library(
+    name = "distribution_proto",
+    srcs = ["distribution.proto"],
+    deps = [
+        ":annotations_proto",
         "@com_google_protobuf//:any_proto",
-        "@com_google_protobuf//:api_proto",
-        "@com_google_protobuf//:descriptor_proto",
+        "@com_google_protobuf//:timestamp_proto",
+    ],
+)
+
+proto_library(
+    name = "documentation_proto",
+    srcs = ["documentation.proto"],
+)
+
+proto_library(
+    name = "endpoint_proto",
+    srcs = ["endpoint.proto"],
+    deps = [":annotations_proto"],
+)
+
+proto_library(
+    name = "http_proto",
+    srcs = ["http.proto"],
+)
+
+proto_library(
+    name = "httpbody_proto",
+    srcs = ["httpbody.proto"],
+    deps = ["@com_google_protobuf//:any_proto"],
+)
+
+proto_library(
+    name = "label_proto",
+    srcs = ["label.proto"],
+)
+
+proto_library(
+    name = "launch_stage_proto",
+    srcs = ["launch_stage.proto"],
+)
+
+proto_library(
+    name = "log_proto",
+    srcs = ["log.proto"],
+    deps = [":label_proto"],
+)
+
+proto_library(
+    name = "logging_proto",
+    srcs = ["logging.proto"],
+    deps = [":annotations_proto"],
+)
+
+proto_library(
+    name = "metric_proto",
+    srcs = ["metric.proto"],
+    deps = [
+        ":label_proto",
+        ":launch_stage_proto",
         "@com_google_protobuf//:duration_proto",
+    ],
+)
+
+proto_library(
+    name = "monitored_resource_proto",
+    srcs = ["monitored_resource.proto"],
+    deps = [
+        ":label_proto",
         "@com_google_protobuf//:struct_proto",
-        "@com_google_protobuf//:timestamp_proto",
-        "@com_google_protobuf//:type_proto",
-        "@com_google_protobuf//:wrappers_proto",
     ],
 )
 
+proto_library(
+    name = "monitoring_proto",
+    srcs = ["monitoring.proto"],
+    deps = [":annotations_proto"],
+)
+
+proto_library(
+    name = "quota_proto",
+    srcs = ["quota.proto"],
+    deps = [":annotations_proto"],
+)
+
 proto_library(
     name = "service_proto",
     srcs = ["service.proto"],
     deps = [
-        ":api_proto",
+        ":annotations_proto",
+        ":auth_proto",
+        ":backend_proto",
+        ":billing_proto",
+        ":context_proto",
+        ":control_proto",
+        ":documentation_proto",
+        ":endpoint_proto",
+        ":http_proto",
+        ":label_proto",
+        ":log_proto",
+        ":logging_proto",
+        ":metric_proto",
+        ":monitored_resource_proto",
+        ":monitoring_proto",
+        ":quota_proto",
+        ":source_info_proto",
+        ":system_parameter_proto",
+        ":usage_proto",
+        "//google/api/experimental:authorization_config_proto",
         "//google/api/experimental:experimental_proto",
         "@com_google_protobuf//:any_proto",
         "@com_google_protobuf//:api_proto",
@@ -57,10 +170,53 @@ proto_library(
     ],
 )
 
+proto_library(
+    name = "source_info_proto",
+    srcs = ["source_info.proto"],
+    deps = ["@com_google_protobuf//:any_proto"],
+)
+
+proto_library(
+    name = "system_parameter_proto",
+    srcs = ["system_parameter.proto"],
+)
+
+proto_library(
+    name = "usage_proto",
+    srcs = ["usage.proto"],
+    deps = [":annotations_proto"],
+)
+
 ##############################################################################
 # Java
 ##############################################################################
 java_proto_library(
     name = "api_java_proto",
-    deps = [":api_proto"],
+    deps = [
+        "annotations_proto",
+        "auth_proto",
+        "backend_proto",
+        "billing_proto",
+        "config_change_proto",
+        "consumer_proto",
+        "context_proto",
+        "control_proto",
+        "distribution_proto",
+        "documentation_proto",
+        "endpoint_proto",
+        "http_proto",
+        "httpbody_proto",
+        "label_proto",
+        "launch_stage_proto",
+        "log_proto",
+        "logging_proto",
+        "metric_proto",
+        "monitored_resource_proto",
+        "monitoring_proto",
+        "quota_proto",
+        "service_proto",
+        "source_info_proto",
+        "system_parameter_proto",
+        "usage_proto",
+    ],
 )

google/api/experimental/BUILD.bazel

@@ -7,13 +7,21 @@ package(default_visibility = ["//visibility:public"])
 # Common
 ##############################################################################
 proto_library(
-    name = "experimental_proto",
+    name = "authorization_config_proto",
     srcs = [
         "authorization_config.proto",
+    ],
+    deps = [],
+)
+
+proto_library(
+    name = "experimental_proto",
+    srcs = [
         "experimental.proto",
     ],
     deps = [
-        "//google/api:api_proto",
+        ":authorization_config_proto",
+        "//google/api:annotations_proto",
     ],
 )
 
@@ -22,11 +30,8 @@ proto_library(
 ##############################################################################
 java_proto_library(
     name = "experimental_java_proto",
-    deps = [":experimental_proto"],
-)
-
-java_grpc_library(
-    name = "experimental_java_grpc",
-    srcs = [":experimental_proto"],
-    deps = [":experimental_java_proto"],
+    deps = [
+        ":authorization_config_proto",
+        ":experimental_proto",
+    ],
 )

google/bigtable/admin/v2/BUILD.bazel

@@ -23,9 +23,10 @@ proto_library(
         "table.proto",
     ],
     deps = [
-        "//google/api:api_proto",
-        "//google/iam/v1:iam_proto",
-        "//google/longrunning:longrunning_proto",
+        "//google/api:annotations_proto",
+        "//google/iam/v1:iam_policy_proto",
+        "//google/iam/v1:policy_proto",
+        "//google/longrunning:operations_proto",
         "@com_google_protobuf//:duration_proto",
         "@com_google_protobuf//:empty_proto",
         "@com_google_protobuf//:field_mask_proto",
@@ -100,4 +101,4 @@ java_gapic_assembly_gradle_pkg(
         ":bigtableadmin_resource_name_java_proto",
     ] + _JAVA_GRPC_DEPS,
     version = "0.0.0-SNAPSHOT",
-)
+)

google/bigtable/v2/BUILD.bazel

@@ -20,8 +20,8 @@ proto_library(
         "data.proto",
     ],
     deps = [
-        "//google/api:api_proto",
-        "//google/rpc:rpc_proto",
+        "//google/api:annotations_proto",
+        "//google/rpc:status_proto",
         "@com_google_protobuf//:wrappers_proto",
     ],
 )

google/cloud/automl/v1beta1/BUILD.bazel

@@ -31,9 +31,9 @@ proto_library(
         "translation.proto",
     ],
     deps = [
-        "//google/api:api_proto",
-        "//google/longrunning:longrunning_proto",
-        "//google/rpc:rpc_proto",
+        "//google/api:annotations_proto",
+        "//google/longrunning:operations_proto",
+        "//google/rpc:status_proto",
         "@com_google_protobuf//:empty_proto",
         "@com_google_protobuf//:field_mask_proto",
         "@com_google_protobuf//:timestamp_proto",

google/cloud/bigquery/datatransfer/v1/BUILD.bazel

@@ -20,8 +20,8 @@ proto_library(
         ":transfer.proto",
     ],
     deps = [
-        "//google/api:api_proto",
-        "//google/rpc:rpc_proto",
+        "//google/api:annotations_proto",
+        "//google/rpc:status_proto",
         "@com_google_protobuf//:duration_proto",
         "@com_google_protobuf//:empty_proto",
         "@com_google_protobuf//:field_mask_proto",

google/cloud/dataproc/v1/BUILD.bazel

@@ -21,8 +21,8 @@ proto_library(
         "operations.proto",
     ],
     deps = [
-        "//google/api:api_proto",
-        "//google/longrunning:longrunning_proto",
+        "//google/api:annotations_proto",
+        "//google/longrunning:operations_proto",
         "@com_google_protobuf//:field_mask_proto",
         "@com_google_protobuf//:timestamp_proto",
         "@com_google_protobuf//:duration_proto",

google/cloud/dataproc/v1beta2/BUILD.bazel

@@ -23,8 +23,8 @@ proto_library(
         "workflow_templates.proto",
     ],
     deps = [
-        "//google/api:api_proto",
-        "//google/longrunning:longrunning_proto",
+        "//google/api:annotations_proto",
+        "//google/longrunning:operations_proto",
         "@com_google_protobuf//:field_mask_proto",
         "@com_google_protobuf//:timestamp_proto",
         "@com_google_protobuf//:duration_proto",

google/cloud/dialogflow/v2/BUILD.bazel

@@ -25,10 +25,10 @@ proto_library(
         "webhook.proto",
     ],
     deps = [
-        "//google/api:api_proto",
-        "//google/longrunning:longrunning_proto",
-        "//google/rpc:rpc_proto",
-        "//google/type:type_proto",
+        "//google/api:annotations_proto",
+        "//google/longrunning:operations_proto",
+        "//google/rpc:status_proto",
+        "//google/type:latlng_proto",
         "@com_google_protobuf//:empty_proto",
         "@com_google_protobuf//:field_mask_proto",
         "@com_google_protobuf//:struct_proto",

google/cloud/dialogflow/v2beta1/BUILD.bazel

@@ -28,10 +28,10 @@ proto_library(
         "webhook.proto",
     ],
     deps = [
-        "//google/api:api_proto",
-        "//google/longrunning:longrunning_proto",
-        "//google/rpc:rpc_proto",
-        "//google/type:type_proto",
+        "//google/api:annotations_proto",
+        "//google/longrunning:operations_proto",
+        "//google/rpc:status_proto",
+        "//google/type:latlng_proto",
         "@com_google_protobuf//:empty_proto",
         "@com_google_protobuf//:field_mask_proto",
         "@com_google_protobuf//:struct_proto",

google/cloud/iot/v1/BUILD.bazel

@@ -20,9 +20,10 @@ proto_library(
         "resources.proto",
     ],
     deps = [
-        "//google/api:api_proto",
-        "//google/rpc:rpc_proto",
-        "//google/iam/v1:iam_proto",
+        "//google/api:annotations_proto",
+        "//google/rpc:status_proto",
+        "//google/iam/v1:iam_policy_proto",
+        "//google/iam/v1:policy_proto",
         "@com_google_protobuf//:duration_proto",
         "@com_google_protobuf//:empty_proto",
         "@com_google_protobuf//:field_mask_proto",

google/cloud/kms/v1/BUILD.bazel

@@ -20,7 +20,7 @@ proto_library(
         "service.proto",
     ],
     deps = [
-        "//google/api:api_proto",
+        "//google/api:annotations_proto",
         "@com_google_protobuf//:duration_proto",
         "@com_google_protobuf//:timestamp_proto",
         "@com_google_protobuf//:field_mask_proto",
@@ -33,7 +33,8 @@ proto_library_with_info(
     name = "kms_proto_with_info",
     deps = [
         ":kms_proto",
-        "//google/iam/v1:iam_proto",
+        "//google/iam/v1:iam_policy_proto",
+        "//google/iam/v1:policy_proto",
     ],
 )
 

google/cloud/language/v1/BUILD.bazel

@@ -12,7 +12,7 @@ package(default_visibility = ["//visibility:public"])
 proto_library(
     name = "language_proto",
     srcs = ["language_service.proto"],
-    deps = ["//google/api:api_proto"],
+    deps = ["//google/api:annotations_proto"],
 )
 
 proto_library_with_info(

google/cloud/language/v1beta2/BUILD.bazel

@@ -13,9 +13,9 @@ proto_library(
     name = "language_proto",
     srcs = ["language_service.proto"],
     deps = [
-        "//google/api:api_proto",
-        "//google/longrunning:longrunning_proto",
-        "//google/rpc:rpc_proto",
+        "//google/api:annotations_proto",
+        "//google/longrunning:operations_proto",
+        "//google/rpc:status_proto",
         "@com_google_protobuf//:timestamp_proto",
     ],
 )

google/cloud/oslogin/common/BUILD.bazel

@@ -13,7 +13,7 @@ proto_library(
         "common.proto",
     ],
     deps = [
-        "//google/api:api_proto",
+        "//google/api:annotations_proto",
     ],
 )
 

google/cloud/oslogin/v1/BUILD.bazel

@@ -23,7 +23,7 @@ proto_library(
         "oslogin.proto",
     ],
     deps = [
-        "//google/api:api_proto",
+        "//google/api:annotations_proto",
         "@com_google_protobuf//:empty_proto",
         "@com_google_protobuf//:field_mask_proto",
     ] + _PROTO_SUBPACKAGE_DEPS,

google/cloud/redis/v1/BUILD.bazel

@@ -19,8 +19,8 @@ proto_library(
         "cloud_redis.proto",
     ],
     deps = [
-        "//google/api:api_proto",
-        "//google/longrunning:longrunning_proto",
+        "//google/api:annotations_proto",
+        "//google/longrunning:operations_proto",
         "@com_google_protobuf//:field_mask_proto",
         "@com_google_protobuf//:timestamp_proto",
     ],

google/cloud/redis/v1beta1/BUILD.bazel

@@ -19,8 +19,8 @@ proto_library(
         "cloud_redis.proto",
     ],
     deps = [
-        "//google/api:api_proto",
-        "//google/longrunning:longrunning_proto",
+        "//google/api:annotations_proto",
+        "//google/longrunning:operations_proto",
         "@com_google_protobuf//:field_mask_proto",
         "@com_google_protobuf//:timestamp_proto",
     ],

google/cloud/speech/v1/BUILD.bazel

@@ -19,9 +19,9 @@ proto_library(
         "cloud_speech.proto",
     ],
     deps = [
-        "//google/api:api_proto",
-        "//google/longrunning:longrunning_proto",
-        "//google/rpc:rpc_proto",
+        "//google/api:annotations_proto",
+        "//google/longrunning:operations_proto",
+        "//google/rpc:status_proto",
         "@com_google_protobuf//:any_proto",
         "@com_google_protobuf//:duration_proto",
         "@com_google_protobuf//:empty_proto",

google/cloud/speech/v1p1beta1/BUILD.bazel

@@ -19,9 +19,9 @@ proto_library(
         "cloud_speech.proto",
     ],
     deps = [
-        "//google/api:api_proto",
-        "//google/longrunning:longrunning_proto",
-        "//google/rpc:rpc_proto",
+        "//google/api:annotations_proto",
+        "//google/longrunning:operations_proto",
+        "//google/rpc:status_proto",
         "@com_google_protobuf//:any_proto",
         "@com_google_protobuf//:duration_proto",
         "@com_google_protobuf//:empty_proto",

google/cloud/tasks/v2beta2/BUILD.bazel

@@ -22,9 +22,11 @@ proto_library(
         "task.proto",
     ],
     deps = [
-        "//google/api:api_proto",
-        "//google/rpc:rpc_proto",
-        "//google/iam/v1:iam_proto",
+        "//google/api:annotations_proto",
+        "//google/rpc:code_proto",
+        "//google/rpc:status_proto",
+        "//google/iam/v1:iam_policy_proto",
+        "//google/iam/v1:policy_proto",
         "@com_google_protobuf//:duration_proto",
         "@com_google_protobuf//:empty_proto",
         "@com_google_protobuf//:field_mask_proto",

google/cloud/tasks/v2beta3/BUILD.bazel

@@ -22,9 +22,11 @@ proto_library(
         "task.proto",
     ],
     deps = [
-        "//google/api:api_proto",
-        "//google/rpc:rpc_proto",
-        "//google/iam/v1:iam_proto",
+        "//google/api:annotations_proto",
+        "//google/iam/v1:iam_policy_proto",
+        "//google/iam/v1:policy_proto",
+        "//google/rpc:code_proto",
+        "//google/rpc:status_proto",
         "@com_google_protobuf//:duration_proto",
         "@com_google_protobuf//:empty_proto",
         "@com_google_protobuf//:field_mask_proto",

google/cloud/texttospeech/v1/BUILD.bazel

@@ -15,7 +15,7 @@ proto_library(
         "cloud_tts.proto"
     ],
     deps = [
-        "//google/api:api_proto"
+        "//google/api:annotations_proto"
     ],
 )
 

google/cloud/texttospeech/v1beta1/BUILD.bazel

@@ -15,7 +15,7 @@ proto_library(
         "cloud_tts.proto"
     ],
     deps = [
-        "//google/api:api_proto"
+        "//google/api:annotations_proto"
     ],
 )
 

google/cloud/videointelligence/v1/BUILD.bazel

@@ -19,9 +19,9 @@ proto_library(
         "video_intelligence.proto",
     ],
     deps = [
-        "//google/api:api_proto",
-        "//google/longrunning:longrunning_proto",
-        "//google/rpc:rpc_proto",
+        "//google/api:annotations_proto",
+        "//google/longrunning:operations_proto",
+        "//google/rpc:status_proto",
         "@com_google_protobuf//:duration_proto",
         "@com_google_protobuf//:timestamp_proto",
     ],

google/cloud/videointelligence/v1beta1/BUILD.bazel

@@ -19,9 +19,9 @@ proto_library(
         "video_intelligence.proto",
     ],
     deps = [
-        "//google/api:api_proto",
-        "//google/longrunning:longrunning_proto",
-        "//google/rpc:rpc_proto",
+        "//google/api:annotations_proto",
+        "//google/longrunning:operations_proto",
+        "//google/rpc:status_proto",
         "@com_google_protobuf//:timestamp_proto",
     ],
 )

google/cloud/videointelligence/v1beta2/BUILD.bazel

@@ -19,9 +19,9 @@ proto_library(
         "video_intelligence.proto",
     ],
     deps = [
-        "//google/api:api_proto",
-        "//google/longrunning:longrunning_proto",
-        "//google/rpc:rpc_proto",
+        "//google/api:annotations_proto",
+        "//google/longrunning:operations_proto",
+        "//google/rpc:status_proto",
         "@com_google_protobuf//:duration_proto",
         "@com_google_protobuf//:timestamp_proto",
     ],

google/cloud/videointelligence/v1p1beta1/BUILD.bazel

@@ -19,9 +19,9 @@ proto_library(
         "video_intelligence.proto",
     ],
     deps = [
-        "//google/api:api_proto",
-        "//google/longrunning:longrunning_proto",
-        "//google/rpc:rpc_proto",
+        "//google/api:annotations_proto",
+        "//google/longrunning:operations_proto",
+        "//google/rpc:status_proto",
         "@com_google_protobuf//:duration_proto",
         "@com_google_protobuf//:timestamp_proto",
     ],

google/cloud/videointelligence/v1p2beta1/BUILD.bazel

@@ -19,9 +19,9 @@ proto_library(
         "video_intelligence.proto",
     ],
     deps = [
-        "//google/api:api_proto",
-        "//google/longrunning:longrunning_proto",
-        "//google/rpc:rpc_proto",
+        "//google/api:annotations_proto",
+        "//google/longrunning:operations_proto",
+        "//google/rpc:status_proto",
         "@com_google_protobuf//:duration_proto",
         "@com_google_protobuf//:timestamp_proto",
     ],

google/cloud/vision/v1/BUILD.bazel

@@ -24,10 +24,11 @@ proto_library(
         "web_detection.proto",
     ],
     deps = [
-        "//google/api:api_proto",
-        "//google/longrunning:longrunning_proto",
-        "//google/rpc:rpc_proto",
-        "//google/type:type_proto",
+        "//google/api:annotations_proto",
+        "//google/longrunning:operations_proto",
+        "//google/rpc:status_proto",
+        "//google/type:color_proto",
+        "//google/type:latlng_proto",
         "@com_google_protobuf//:empty_proto",
         "@com_google_protobuf//:field_mask_proto",
         "@com_google_protobuf//:timestamp_proto",

google/cloud/vision/v1p1beta1/BUILD.bazel

@@ -22,10 +22,11 @@ proto_library(
         "web_detection.proto",
     ],
     deps = [
-        "//google/api:api_proto",
-        "//google/longrunning:longrunning_proto",
-        "//google/type:type_proto",
-        "//google/rpc:rpc_proto",
+        "//google/api:annotations_proto",
+        "//google/longrunning:operations_proto",
+        "//google/rpc:status_proto",
+        "//google/type:color_proto",
+        "//google/type:latlng_proto",
     ],
 )
 

google/cloud/vision/v1p2beta1/BUILD.bazel

@@ -22,10 +22,11 @@ proto_library(
         "web_detection.proto",
     ],
     deps = [
-        "//google/api:api_proto",
-        "//google/longrunning:longrunning_proto",
-        "//google/rpc:rpc_proto",
-        "//google/type:type_proto",
+        "//google/api:annotations_proto",
+        "//google/longrunning:operations_proto",
+        "//google/rpc:status_proto",
+        "//google/type:color_proto",
+        "//google/type:latlng_proto",
         "@com_google_protobuf//:timestamp_proto",
     ],
 )

google/cloud/vision/v1p3beta1/BUILD.bazel

@@ -24,10 +24,11 @@ proto_library(
         "web_detection.proto",
     ],
     deps = [
-        "//google/api:api_proto",
-        "//google/longrunning:longrunning_proto",
-        "//google/rpc:rpc_proto",
-        "//google/type:type_proto",
+        "//google/api:annotations_proto",
+        "//google/longrunning:operations_proto",
+        "//google/rpc:status_proto",
+        "//google/type:color_proto",
+        "//google/type:latlng_proto",
         "@com_google_protobuf//:empty_proto",
         "@com_google_protobuf//:field_mask_proto",
         "@com_google_protobuf//:timestamp_proto",
@@ -102,5 +103,3 @@ java_gapic_assembly_gradle_pkg(
     ] + _JAVA_GRPC_DEPS,
     version = "0.0.0-SNAPSHOT",
 )
-
-

google/cloud/websecurityscanner/v1alpha/BUILD.bazel

@@ -21,7 +21,7 @@ proto_library(
         "web_security_scanner.proto",
     ],
     deps = [
-        "//google/api:api_proto",
+        "//google/api:annotations_proto",
         "@com_google_protobuf//:timestamp_proto",
         "@com_google_protobuf//:empty_proto",
         "@com_google_protobuf//:field_mask_proto",

google/container/v1/BUILD.bazel

@@ -13,7 +13,7 @@ proto_library(
     name = "container_proto",
     srcs = ["cluster_service.proto"],
     deps = [
-        "//google/api:api_proto",
+        "//google/api:annotations_proto",
         "@com_google_protobuf//:empty_proto",
     ],
 )

google/devtools/clouderrorreporting/v1beta1/BUILD.bazel

@@ -22,7 +22,8 @@ proto_library(
         "report_errors_service.proto",
     ],
     deps = [
-        "//google/api:api_proto",
+        "//google/api:annotations_proto",
+        "//google/api:monitored_resource_proto",
         "@com_google_protobuf//:timestamp_proto",
         "@com_google_protobuf//:duration_proto",
     ],

google/devtools/cloudtrace/v1/BUILD.bazel

@@ -19,7 +19,7 @@ proto_library(
         "trace.proto",
     ],
     deps = [
-        "//google/api:api_proto",
+        "//google/api:annotations_proto",
         "@com_google_protobuf//:empty_proto",
         "@com_google_protobuf//:timestamp_proto",
     ],

google/devtools/cloudtrace/v2/BUILD.bazel

@@ -20,8 +20,8 @@ proto_library(
         "tracing.proto",
     ],
     deps = [
-        "//google/api:api_proto",
-        "//google/rpc:rpc_proto",
+        "//google/api:annotations_proto",
+        "//google/rpc:status_proto",
         "@com_google_protobuf//:empty_proto",
         "@com_google_protobuf//:timestamp_proto",
         "@com_google_protobuf//:wrappers_proto",

google/devtools/containeranalysis/v1beta1/BUILD.bazel

@@ -33,8 +33,9 @@ proto_library(
         "containeranalysis.proto",
     ],
     deps = [
-        "//google/api:api_proto",
-        "//google/iam/v1:iam_proto",
+        "//google/api:annotations_proto",
+        "//google/iam/v1:iam_policy_proto",
+        "//google/iam/v1:policy_proto",
         "@com_google_protobuf//:timestamp_proto",
     ],
 )

google/devtools/containeranalysis/v1beta1/discovery/BUILD.bazel

@@ -14,7 +14,7 @@ proto_library(
     ],
     deps = [
         "//google/devtools/containeranalysis/v1beta1/common:common_proto",
-        "//google/rpc:rpc_proto",
+        "//google/rpc:status_proto",
         "@com_google_protobuf//:timestamp_proto",
     ],
 )

google/devtools/containeranalysis/v1beta1/grafeas/BUILD.bazel

@@ -13,7 +13,7 @@ proto_library(
         "grafeas.proto",
     ],
     deps = [
-        "//google/api:api_proto",
+        "//google/api:annotations_proto",
         "//google/devtools/containeranalysis/v1beta1/attestation:attestation_proto",
         "//google/devtools/containeranalysis/v1beta1/build:build_proto",
         "//google/devtools/containeranalysis/v1beta1/common:common_proto",
@@ -23,7 +23,7 @@ proto_library(
         "//google/devtools/containeranalysis/v1beta1/package:package_proto",
         "//google/devtools/containeranalysis/v1beta1/provenance:provenance_proto",
         "//google/devtools/containeranalysis/v1beta1/vulnerability:vulnerability_proto",
-        "//google/rpc:rpc_proto",
+        "//google/rpc:status_proto",
         "@com_google_protobuf//:empty_proto",
         "@com_google_protobuf//:field_mask_proto",
         "@com_google_protobuf//:timestamp_proto",

google/firestore/v1beta1/BUILD.bazel

@@ -23,9 +23,9 @@ proto_library(
         "write.proto",
     ],
     deps = [
-        "//google/api:api_proto",
-        "//google/type:type_proto",
-        "//google/rpc:rpc_proto",
+        "//google/api:annotations_proto",
+        "//google/type:latlng_proto",
+        "//google/rpc:status_proto",
         "@com_google_protobuf//:empty_proto",
         "@com_google_protobuf//:struct_proto",
         "@com_google_protobuf//:timestamp_proto",

google/iam/v1/BUILD.bazel

@@ -7,13 +7,19 @@ package(default_visibility = ["//visibility:public"])
 # Common
 ##############################################################################
 proto_library(
-    name = "iam_proto",
-    srcs = [
-        "iam_policy.proto",
-        "policy.proto",
+    name = "iam_policy_proto",
+    srcs = ["iam_policy.proto"],
+    deps = [
+        ":policy_proto",
+        "//google/api:annotations_proto",
     ],
+)
+
+proto_library(
+    name = "policy_proto",
+    srcs = ["policy.proto"],
     deps = [
-        "//google/api:api_proto",
+        "//google/api:annotations_proto",
     ],
 )
 
@@ -22,11 +28,14 @@ proto_library(
 ##############################################################################
 java_proto_library(
     name = "iam_java_proto",
-    deps = [":iam_proto"],
+    deps = [
+        ":iam_policy_proto",
+        ":policy_proto",
+    ],
 )
 
 java_grpc_library(
     name = "iam_java_grpc",
-    srcs = [":iam_proto"],
+    srcs = [":iam_policy_proto"],
     deps = [":iam_java_proto"],
 )

google/iam/v1/logging/BUILD.bazel

@@ -5,13 +5,13 @@ package(default_visibility = ["//visibility:public"])
 # Common
 ##############################################################################
 proto_library(
-    name = "logging_proto",
+    name = "audit_data_proto",
     srcs = [
         "audit_data.proto",
     ],
     deps = [
-        "//google/api:api_proto",
-        "//google/iam/v1:iam_proto",
+        "//google/api:annotations_proto",
+        "//google/iam/v1:policy_proto",
     ],
 )
 
@@ -20,5 +20,5 @@ proto_library(
 ##############################################################################
 java_proto_library(
     name = "logging_java_proto",
-    deps = [":logging_proto"],
+    deps = [":audit_data_proto"],
 )

google/logging/type/BUILD.bazel

@@ -8,33 +8,49 @@ package(default_visibility = ["//visibility:public"])
 # Common
 ##############################################################################
 proto_library(
-    name = "type_proto",
-    srcs = [
-        "http_request.proto",
-        "log_severity.proto",
+    name = "http_request_proto",
+    srcs = ["http_request.proto"],
+    deps = [
+        "//google/api:annotations_proto",
+        "@com_google_protobuf//:duration_proto",
     ],
+)
+
+proto_library(
+    name = "log_severity_proto",
+    srcs = ["log_severity.proto"],
     deps = [
-        "//google/api:api_proto",
+        "//google/api:annotations_proto",
         "@com_google_protobuf//:duration_proto",
     ],
 )
 
+
 ##############################################################################
 # Java
 ##############################################################################
 java_proto_library(
     name = "type_java_proto",
-    deps = [":type_proto"],
+    deps = [
+        ":http_request_proto",
+        ":log_severity_proto"
+    ],
 )
 
-java_grpc_library(
-    name = "type_java_grpc",
-    srcs = [":type_proto"],
-    deps = [":type_java_proto"],
-)
+#java_grpc_library(
+#    name = "type_java_grpc",
+#    srcs = [
+#        ":http_request_proto",
+#        "log_severity_proto",
+#    ],
+#    deps = [":type_java_proto"],
+#)
 
 java_resource_name_proto_library(
     name = "type_resource_name_java_proto",
     gapic_yaml = "//google/logging/v2:logging_gapic.yaml",
-    deps = [":type_proto"],
+    deps = [
+        ":http_request_proto",
+        ":log_severity_proto",
+    ],
 )

google/logging/v2/BUILD.bazel

@@ -14,7 +14,8 @@ package(default_visibility = ["//visibility:public"])
 # Common
 ##############################################################################
 _PROTO_SUBPACKAGE_DEPS = [
-    "//google/logging/type:type_proto",
+    "//google/logging/type:http_request_proto",
+    "//google/logging/type:log_severity_proto",
 ]
 
 proto_library(
@@ -26,8 +27,11 @@ proto_library(
         "logging_metrics.proto",
     ],
     deps = [
-        "//google/api:api_proto",
-        "//google/rpc:rpc_proto",
+        "//google/api:annotations_proto",
+        "//google/api:monitored_resource_proto",
+        "//google/api:distribution_proto",
+        "//google/api:metric_proto",
+        "//google/rpc:status_proto",
         "@com_google_protobuf//:any_proto",
         "@com_google_protobuf//:struct_proto",
         "@com_google_protobuf//:timestamp_proto",
@@ -58,7 +62,7 @@ _JAVA_PROTO_SUBPACKAGE_DEPS = [
 ]
 
 _JAVA_GRPC_SUBPACKAGE_DEPS = [
-    "//google/logging/type:type_java_grpc",
+    #    "//google/logging/type:type_java_grpc",
 ]
 
 _RESOURCE_NAME_JAVA_PROTO_SUBPACKAGE_DEPS = [

google/longrunning/BUILD.bazel

@@ -7,13 +7,11 @@ package(default_visibility = ["//visibility:public"])
 # Common
 ##############################################################################
 proto_library(
-    name = "longrunning_proto",
-    srcs = [
-        "operations.proto",
-    ],
+    name = "operations_proto",
+    srcs = ["operations.proto"],
     deps = [
-        "//google/api:api_proto",
-        "//google/rpc:rpc_proto",
+        "//google/api:annotations_proto",
+        "//google/rpc:status_proto",
         "@com_google_protobuf//:any_proto",
         "@com_google_protobuf//:empty_proto",
     ],
@@ -24,11 +22,11 @@ proto_library(
 ##############################################################################
 java_proto_library(
     name = "longrunning_java_proto",
-    deps = [":longrunning_proto"],
+    deps = [":operations_proto"],
 )
 
 java_grpc_library(
     name = "longrunning_java_grpc",
-    srcs = [":longrunning_proto"],
+    srcs = [":operations_proto"],
     deps = [":longrunning_java_proto"],
 )

google/monitoring/v3/BUILD.bazel

@@ -15,7 +15,6 @@ package(default_visibility = ["//visibility:public"])
 ##############################################################################
 proto_library(
     name = "monitoring_proto",
-
     srcs = [
         "alert.proto",
         "alert_service.proto",
@@ -33,15 +32,19 @@ proto_library(
         "uptime_service.proto",
     ],
     deps = [
-        "//google/api:api_proto",
-        "//google/longrunning:longrunning_proto",
-        "//google/rpc:rpc_proto",
+        "//google/api:annotations_proto",
+        "//google/api:distribution_proto",
+        "//google/api:monitored_resource_proto",
+        "//google/api:metric_proto",
+        "//google/api:label_proto",
+        "//google/longrunning:operations_proto",
+        "//google/rpc:status_proto",
         "@com_google_protobuf//:duration_proto",
-        "@com_google_protobuf//:wrappers_proto",
-        "@com_google_protobuf//:field_mask_proto",
-        "@com_google_protobuf//:timestamp_proto",
         "@com_google_protobuf//:empty_proto",
+        "@com_google_protobuf//:field_mask_proto",
         "@com_google_protobuf//:struct_proto",
+        "@com_google_protobuf//:timestamp_proto",
+        "@com_google_protobuf//:wrappers_proto",
     ],
 )
 

google/privacy/dlp/v2/BUILD.bazel

@@ -20,9 +20,11 @@ proto_library(
         "storage.proto",
     ],
     deps = [
-        "//google/api:api_proto",
-        "//google/rpc:rpc_proto",
-        "//google/type:type_proto",
+        "//google/api:annotations_proto",
+        "//google/rpc:status_proto",
+        "//google/type:date_proto",
+        "//google/type:dayofweek_proto",
+        "//google/type:timeofday_proto",
         "@com_google_protobuf//:duration_proto",
         "@com_google_protobuf//:empty_proto",
         "@com_google_protobuf//:field_mask_proto",

google/pubsub/v1/BUILD.bazel

@@ -17,7 +17,7 @@ proto_library(
     name = "pubsub_proto",
     srcs = ["pubsub.proto"],
     deps = [
-        "//google/api:api_proto",
+        "//google/api:annotations_proto",
         "@com_google_protobuf//:duration_proto",
         "@com_google_protobuf//:empty_proto",
         "@com_google_protobuf//:field_mask_proto",
@@ -29,7 +29,8 @@ proto_library_with_info(
     name = "pubsub_proto_with_info",
     deps = [
         ":pubsub_proto",
-        "//google/iam/v1:iam_proto",
+        "//google/iam/v1:iam_policy_proto",
+        "//google/iam/v1:policy_proto",
     ],
 )
 

google/rpc/BUILD.bazel

@@ -7,15 +7,24 @@ package(default_visibility = ["//visibility:public"])
 # Common
 ##############################################################################
 proto_library(
-    name = "rpc_proto",
-    srcs = [
-        "code.proto",
-        "error_details.proto",
-        "status.proto",
+    name = "code_proto",
+    srcs = ["code.proto"],
+    deps = [],
+)
+
+proto_library(
+    name = "error_details_proto",
+    srcs = ["error_details.proto"],
+    deps = [
+        "@com_google_protobuf//:duration_proto",
     ],
+)
+
+proto_library(
+    name = "status_proto",
+    srcs = ["status.proto"],
     deps = [
         "@com_google_protobuf//:any_proto",
-        "@com_google_protobuf//:duration_proto",
     ],
 )
 
@@ -24,11 +33,9 @@ proto_library(
 ##############################################################################
 java_proto_library(
     name = "rpc_java_proto",
-    deps = [":rpc_proto"],
-)
-
-java_grpc_library(
-    name = "rpc_java_grpc",
-    srcs = [":rpc_proto"],
-    deps = [":rpc_java_proto"],
+    deps = [
+        ":code_proto",
+        ":error_details_proto",
+        ":status_proto",
+    ],
 )

google/spanner/admin/database/v1/BUILD.bazel

@@ -19,9 +19,10 @@ proto_library(
         "spanner_database_admin.proto",
     ],
     deps = [
-        "//google/api:api_proto",
-        "//google/iam/v1:iam_proto",
-        "//google/longrunning:longrunning_proto",
+        "//google/api:annotations_proto",
+        "//google/iam/v1:iam_policy_proto",
+        "//google/iam/v1:policy_proto",
+        "//google/longrunning:operations_proto",
         "@com_google_protobuf//:empty_proto",
         "@com_google_protobuf//:timestamp_proto",
     ],

google/spanner/admin/instance/v1/BUILD.bazel

@@ -19,9 +19,10 @@ proto_library(
         "spanner_instance_admin.proto",
     ],
     deps = [
-        "//google/api:api_proto",
-        "//google/iam/v1:iam_proto",
-        "//google/longrunning:longrunning_proto",
+        "//google/api:annotations_proto",
+        "//google/iam/v1:iam_policy_proto",
+        "//google/iam/v1:policy_proto",
+        "//google/longrunning:operations_proto",
         "@com_google_protobuf//:empty_proto",
         "@com_google_protobuf//:field_mask_proto",
         "@com_google_protobuf//:timestamp_proto",

google/spanner/v1/BUILD.bazel

@@ -25,7 +25,7 @@ proto_library(
         "type.proto",
     ],
     deps = [
-        "//google/api:api_proto",
+        "//google/api:annotations_proto",
         "@com_google_protobuf//:duration_proto",
         "@com_google_protobuf//:empty_proto",
         "@com_google_protobuf//:struct_proto",

google/type/BUILD.bazel

@@ -7,31 +7,55 @@ package(default_visibility = ["//visibility:public"])
 # Common
 ##############################################################################
 proto_library(
-    name = "type_proto",
-    srcs = [
-        "color.proto",
-        "date.proto",
-        "dayofweek.proto",
-        "latlng.proto",
-        "money.proto",
-        "postal_address.proto",
-        "timeofday.proto",
-    ],
+    name = "color_proto",
+    srcs = ["color.proto"],
     deps = [
         "@com_google_protobuf//:wrappers_proto",
     ],
 )
 
+proto_library(
+    name = "date_proto",
+    srcs = ["date.proto"],
+)
+
+proto_library(
+    name = "dayofweek_proto",
+    srcs = ["dayofweek.proto"],
+)
+
+proto_library(
+    name = "latlng_proto",
+    srcs = ["latlng.proto"],
+)
+
+proto_library(
+    name = "money_proto",
+    srcs = ["money.proto"],
+)
+
+proto_library(
+    name = "postal_address_proto",
+    srcs = ["postal_address.proto"],
+)
+
+proto_library(
+    name = "timeofday_proto",
+    srcs = ["timeofday.proto"],
+)
+
 ##############################################################################
 # Java
 ##############################################################################
 java_proto_library(
     name = "type_java_proto",
-    deps = [":type_proto"],
-)
-
-java_grpc_library(
-    name = "type_java_grpc",
-    srcs = [":type_proto"],
-    deps = [":type_java_proto"],
+    deps = [
+        ":color_proto",
+        ":date_proto",
+        ":dayofweek_proto",
+        ":latlng_proto",
+        ":money_proto",
+        ":postal_address_proto",
+        ":timeofday_proto",
+    ],
 )