Skip to content

Add support for proto descriptor sets #532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Mar 20, 2026
+19 −4
Merged

Add support for proto descriptor sets #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ git_repository(
bazel_dep(name = "protobuf", version = "31.1")
bazel_dep(name = "rules_android", version = "0.6.0")
bazel_dep(name = "rules_jni", version = "0.11.1")
bazel_dep(name = "rules_proto", version = "7.1.0")

git_repository(
name = "skia",
Expand Down
14 changes: 14 additions & 0 deletions ink/storage/proto/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
load("@protobuf//bazel:proto_library.bzl", "proto_library")
load("@rules_proto//proto:defs.bzl", "proto_descriptor_set")

package(
default_visibility = ["//visibility:public"],
Expand Down Expand Up @@ -45,6 +46,14 @@ proto_library(
srcs = ["color.proto"],
)

proto_library(
name = "options_proto",
srcs = ["options.proto"],
deps = [
"@protobuf//:descriptor_proto",
],
)

proto_library(
name = "stroke_input_batch_proto",
srcs = ["stroke_input_batch.proto"],
Expand Down Expand Up @@ -108,3 +117,8 @@ cc_proto_library(
name = "coded_numeric_run_cc_proto",
deps = [":coded_numeric_run_proto"],
)

proto_descriptor_set(
name = "brush_family_proto_descriptor_set",
deps = [":brush_family_proto"],
)
8 changes: 4 additions & 4 deletions ink/storage/proto/options.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@ edition = "2023";

package ink.proto;

import "net/proto2/proto/descriptor.proto";
import "google/protobuf/descriptor.proto";

option java_package = "com.google.ink.proto";
option java_outer_classname = "OptionsProto";

// Extend FieldOptions, MessageOptions, EnumOptions, and EnumValueOptions to
// include Version.
extend proto2.FieldOptions {
extend google.protobuf.FieldOptions {
int32 field_min_version = 525000068;
}
extend proto2.MessageOptions {
extend google.protobuf.MessageOptions {
int32 message_min_version = 525000037;
}
extend proto2.EnumValueOptions {
extend google.protobuf.EnumValueOptions {
int32 enum_value_min_version = 525000143;
}
Loading