Update to support OEMCrypto v16 with ODK

protos/public/BUILD

@@ -10,7 +10,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-load("@protobuf_repo//:protobuf.bzl", "cc_proto_library", "py_proto_library")
+load("@com_google_protobuf//:protobuf.bzl", "py_proto_library")
 
 # Only a subset of files are included in binary release.
 filegroup(
@@ -18,127 +18,228 @@ filegroup(
     srcs = [
         "certificate_provisioning.proto",
         "client_identification.proto",
+        "device_common.proto",
+        "external_license.proto",
+        "hash_algorithm.proto",
+        "license_protocol.proto",
         "provisioned_device_info.proto",
         "remote_attestation.proto",
         "signed_drm_certificate.proto",
-    ]
+    ],
+)
+
+proto_library(
+    name = "certificate_provisioning_proto",
+    srcs = ["certificate_provisioning.proto"],
+    deps = [
+        ":client_identification_proto",
+        ":hash_algorithm_proto",
+        ":remote_attestation_proto",
+    ],
 )
 
 cc_proto_library(
-    name = "certificate_provisioning_proto",
-    srcs = ["certificate_provisioning.proto"],
-    default_runtime = "@protobuf_repo//:protobuf",
-    protoc = "@protobuf_repo//:protoc",
-    deps = [
-        ":client_identification_proto",
-        ":remote_attestation_proto",
-    ],
+    name = "certificate_provisioning_cc_proto",
+    deps = [":certificate_provisioning_proto"],
 )
 
 py_proto_library(
     name = "certificate_provisioning_py_pb2",
     srcs = ["certificate_provisioning.proto"],
-    default_runtime = "@protobuf_repo//:protobuf_python",
-    protoc = "@protobuf_repo//:protoc",
+    default_runtime = "@com_google_protobuf//:protobuf_python",
+    protoc = "@com_google_protobuf//:protoc",
     deps = [
         ":client_identification_py_pb2",
+        ":hash_algorithm_py_pb2",
         ":remote_attestation_py_pb2",
     ],
 )
 
-cc_proto_library(
+proto_library(
     name = "client_identification_proto",
     srcs = ["client_identification.proto"],
-    default_runtime = "@protobuf_repo//:protobuf",
-    protoc = "@protobuf_repo//:protoc",
+)
+
+cc_proto_library(
+    name = "client_identification_cc_proto",
+    deps = [":client_identification_proto"],
 )
 
 py_proto_library(
     name = "client_identification_py_pb2",
     srcs = ["client_identification.proto"],
-    default_runtime = "@protobuf_repo//:protobuf_python",
-    protoc = "@protobuf_repo//:protoc",
+    default_runtime = "@com_google_protobuf//:protobuf_python",
+    protoc = "@com_google_protobuf//:protoc",
+)
+
+proto_library(
+    name = "device_common_proto",
+    srcs = ["device_common.proto"],
 )
 
 cc_proto_library(
+    name = "device_common_cc_proto",
+    deps = [":device_common_proto"],
+)
+
+java_proto_library(
+    name = "device_common_java_proto",
+    deps = [":device_common_proto"],
+)
+
+proto_library(
     name = "device_certificate_status_proto",
     srcs = ["device_certificate_status.proto"],
-    default_runtime = "@protobuf_repo//:protobuf",
-    protoc = "@protobuf_repo//:protoc",
-    deps = [":provisioned_device_info_proto"],
+    deps = [
+        ":hash_algorithm_proto",
+        ":provisioned_device_info_proto",
+    ],
+)
+
+cc_proto_library(
+    name = "device_certificate_status_cc_proto",
+    deps = [":device_certificate_status_proto"],
 )
 
 py_proto_library(
     name = "device_certificate_status_py_pb2",
     srcs = ["device_certificate_status.proto"],
-    default_runtime = "@protobuf_repo//:protobuf_python",
-    protoc = "@protobuf_repo//:protoc",
+    default_runtime = "@com_google_protobuf//:protobuf_python",
+    protoc = "@com_google_protobuf//:protoc",
     deps = [":provisioned_device_info_py_pb2"],
 )
 
-cc_proto_library(
+proto_library(
     name = "drm_certificate_proto",
     srcs = ["drm_certificate.proto"],
-    default_runtime = "@protobuf_repo//:protobuf",
-    protoc = "@protobuf_repo//:protoc",
-    deps = [":provisioned_device_info_proto"],
+)
+
+cc_proto_library(
+    name = "drm_certificate_cc_proto",
+    deps = [":drm_certificate_proto"],
 )
 
 py_proto_library(
     name = "drm_certificate_py_pb2",
     srcs = ["drm_certificate.proto"],
-    default_runtime = "@protobuf_repo//:protobuf_python",
-    protoc = "@protobuf_repo//:protoc",
+    default_runtime = "@com_google_protobuf//:protobuf_python",
+    protoc = "@com_google_protobuf//:protoc",
     deps = [":provisioned_device_info_py_pb2"],
 )
 
-cc_proto_library(
+proto_library(
     name = "errors_proto",
     srcs = ["errors.proto"],
-    default_runtime = "@protobuf_repo//:protobuf",
-    protoc = "@protobuf_repo//:protoc",
 )
 
 cc_proto_library(
+    name = "errors_cc_proto",
+    deps = [":errors_proto"],
+)
+
+proto_library(
+    name = "external_license_proto",
+    srcs = ["external_license.proto"],
+    deps = [
+        ":client_identification_proto",
+        ":license_protocol_proto",
+    ],
+)
+
+cc_proto_library(
+    name = "external_license_cc_proto",
+    deps = [":external_license_proto"],
+)
+
+proto_library(
     name = "remote_attestation_proto",
     srcs = ["remote_attestation.proto"],
-    default_runtime = "@protobuf_repo//:protobuf",
-    protoc = "@protobuf_repo//:protoc",
     deps = [":client_identification_proto"],
 )
 
+cc_proto_library(
+    name = "remote_attestation_cc_proto",
+    deps = [":remote_attestation_proto"],
+)
+
 py_proto_library(
     name = "remote_attestation_py_pb2",
     srcs = ["remote_attestation.proto"],
-    default_runtime = "@protobuf_repo//:protobuf_python",
-    protoc = "@protobuf_repo//:protoc",
+    default_runtime = "@com_google_protobuf//:protobuf_python",
+    protoc = "@com_google_protobuf//:protoc",
     deps = [":client_identification_py_pb2"],
 )
 
-cc_proto_library(
+proto_library(
     name = "signed_drm_certificate_proto",
     srcs = ["signed_drm_certificate.proto"],
-    default_runtime = "@protobuf_repo//:protobuf",
-    protoc = "@protobuf_repo//:protoc",
+    deps = [":hash_algorithm_proto"],
+)
+
+cc_proto_library(
+    name = "signed_drm_certificate_cc_proto",
+    deps = [":signed_drm_certificate_proto"],
 )
 
 py_proto_library(
     name = "signed_drm_certificate_py_pb2",
     srcs = ["signed_drm_certificate.proto"],
-    default_runtime = "@protobuf_repo//:protobuf_python",
-    protoc = "@protobuf_repo//:protoc",
+    default_runtime = "@com_google_protobuf//:protobuf_python",
+    protoc = "@com_google_protobuf//:protoc",
+    deps = [":hash_algorithm_py_pb2"],
+)
+
+proto_library(
+    name = "provisioned_device_info_proto",
+    srcs = ["provisioned_device_info.proto"],
+    deps = [":device_common_proto"],
 )
 
 cc_proto_library(
-    name = "provisioned_device_info_proto",
-    srcs = ["provisioned_device_info.proto"],
-    default_runtime = "@protobuf_repo//:protobuf",
-    protoc = "@protobuf_repo//:protoc",
+    name = "provisioned_device_info_cc_proto",
+    deps = [":provisioned_device_info_proto"],
 )
 
 py_proto_library(
     name = "provisioned_device_info_py_pb2",
     srcs = ["provisioned_device_info.proto"],
-    default_runtime = "@protobuf_repo//:protobuf_python",
-    protoc = "@protobuf_repo//:protoc",
+    default_runtime = "@com_google_protobuf//:protobuf_python",
+    protoc = "@com_google_protobuf//:protoc",
+)
+
+proto_library(
+    name = "license_protocol_proto",
+    srcs = ["license_protocol.proto"],
+    deps = [
+        ":client_identification_proto",
+        ":hash_algorithm_proto",
+        ":remote_attestation_proto",
+    ],
+)
+
+cc_proto_library(
+    name = "license_protocol_cc_proto",
+    deps = [":license_protocol_proto"],
+)
+
+proto_library(
+    name = "hash_algorithm_proto",
+    srcs = ["hash_algorithm.proto"],
+)
+
+cc_proto_library(
+    name = "hash_algorithm_cc_proto",
+    deps = [":hash_algorithm_proto"],
+)
+
+java_proto_library(
+    name = "hash_algorithm_java_proto",
+    deps = [":hash_algorithm_proto"],
+)
+
+py_proto_library(
+    name = "hash_algorithm_py_pb2",
+    srcs = ["hash_algorithm.proto"],
+    default_runtime = "@com_google_protobuf//:protobuf_python",
+    protoc = "@com_google_protobuf//:protoc",
 )