From 5bc20e2ea4ca18095c359dc4838a26efe1f570f6 Mon Sep 17 00:00:00 2001
From: suetfei <suetfei@google.com>
Date: Thu, 27 Jan 2022 16:42:01 -0800
Subject: [PATCH] Internal cleaup for protos.

PiperOrigin-RevId: 424738503
---
 proto/BUILD           |  9 ++++++++-
 proto/errorcode/BUILD |  7 ++++++-
 proto/mediums/BUILD   | 41 ++++++++++++++++++++++++-----------------
 3 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/proto/BUILD b/proto/BUILD
index 41050493..788bf324 100644
--- a/proto/BUILD
+++ b/proto/BUILD
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 # Proto for Nearby products
-
 load("//net/proto2/contrib/portable/cc:portable_proto_build_defs.bzl", "portable_proto_library")
+load("//tools/build_defs/proto/cpp:cc_proto_library.bzl", "cc_proto_library")
 
 licenses(["notice"])
 
@@ -45,6 +45,13 @@ java_proto_library(
     deps = [":connections_enums_proto"],
 )
 
+cc_proto_library(
+    name = "connections_enums_cc_proto",
+    deps = [
+        ":connections_enums_proto",
+    ],
+)
+
 portable_proto_library(
     name = "connections_enums_portable_proto",
     compatible_with = [
diff --git a/proto/errorcode/BUILD b/proto/errorcode/BUILD
index 0589c829..b6734ec7 100644
--- a/proto/errorcode/BUILD
+++ b/proto/errorcode/BUILD
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 # Proto for Nearby products
-
 load("//net/proto2/contrib/portable/cc:portable_proto_build_defs.bzl", "portable_proto_library")
+load("//tools/build_defs/proto/cpp:cc_proto_library.bzl", "cc_proto_library")
 
 licenses(["notice"])
 
@@ -35,6 +35,11 @@ java_lite_proto_library(
     deps = [":error_code_enums_proto"],
 )
 
+cc_proto_library(
+    name = "error_code_enums_cc_proto",
+    deps = [":error_code_enums_proto"],
+)
+
 portable_proto_library(
     name = "error_code_enums_portable_proto",
     compatible_with = [
diff --git a/proto/mediums/BUILD b/proto/mediums/BUILD
index 5001e2ea..63304169 100644
--- a/proto/mediums/BUILD
+++ b/proto/mediums/BUILD
@@ -50,23 +50,6 @@ java_lite_proto_library(
     deps = [":wifi_aware_frames_proto"],
 )
 
-proto_library(
-    name = "ble_frames_proto",
-    srcs = [
-        "ble_frames.proto",
-    ],
-    cc_api_version = 2,
-)
-
-java_lite_proto_library(
-    name = "ble_frames_java_proto_lite",
-    visibility = [
-        "//java/com/google/android/gmscore/integ/modules/nearby/src/com/google/android/gms/nearby/mediums:__subpackages__",
-        "//javatests/com/google/android/gmscore/integ/modules/nearby/src/com/google/android/gms/nearby/mediums:__subpackages__",
-    ],
-    deps = [":ble_frames_proto"],
-)
-
 proto_library(
     name = "web_rtc_signaling_frames_proto",
     srcs = [
@@ -99,6 +82,30 @@ java_lite_proto_library(
     deps = [":web_rtc_signaling_frames_proto"],
 )
 
+proto_library(
+    name = "ble_frames_proto",
+    srcs = [
+        "ble_frames.proto",
+    ],
+    cc_api_version = 2,
+)
+
+java_lite_proto_library(
+    name = "ble_frames_java_proto_lite",
+    visibility = [
+        "//java/com/google/android/gmscore/integ/modules/nearby/src/com/google/android/gms/nearby/mediums:__subpackages__",
+        "//javatests/com/google/android/gmscore/integ/modules/nearby/src/com/google/android/gms/nearby/mediums:__subpackages__",
+    ],
+    deps = [":ble_frames_proto"],
+)
+
+cc_proto_library(
+    name = "ble_frames_cc_proto",
+    deps = [
+        ":ble_frames_proto",
+    ],
+)
+
 portable_proto_library(
     name = "ble_frames_portable_proto",
     config = ":ble_frames_portable_proto_config",