summaryrefslogtreecommitdiff
path: root/rust/protobuf.go
diff options
context:
space:
mode:
author Jeff Vander Stoep <jeffv@google.com> 2023-03-22 15:09:00 +0100
committer Jeff Vander Stoep <jeffv@google.com> 2023-03-24 09:32:36 +0100
commit91c0466094ee93f368f3af3284a097024aef7162 (patch)
tree0d4b720573ffd047b0a02a857289ecf81c48a520 /rust/protobuf.go
parentcd7db25738893ce424757527de6b25193525ae25 (diff)
rust_proto: use protobuf crate version 2.x
Test: build Bug: 270895633 Change-Id: I04e5e7fe70b8c509cd1b35852b75a0f24a633ce9
Diffstat (limited to 'rust/protobuf.go')
-rw-r--r--rust/protobuf.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/rust/protobuf.go b/rust/protobuf.go
index 88e80fe35..e30f25d95 100644
--- a/rust/protobuf.go
+++ b/rust/protobuf.go
@@ -73,7 +73,7 @@ func (proto *protobufDecorator) GenerateSource(ctx ModuleContext, deps PathDeps)
outDir := android.PathForModuleOut(ctx)
protoFiles := android.PathsForModuleSrc(ctx, proto.Properties.Protos)
grpcFiles := android.PathsForModuleSrc(ctx, proto.Properties.Grpc_protos)
- protoPluginPath := ctx.Config().HostToolPath(ctx, "protoc-gen-rust")
+ protoPluginPath := ctx.Config().HostToolPath(ctx, "protoc-gen-rust-deprecated")
commonProtoFlags = append(commonProtoFlags, defaultProtobufFlags...)
commonProtoFlags = append(commonProtoFlags, proto.Properties.Proto_flags...)
@@ -206,7 +206,7 @@ func (proto *protobufDecorator) SourceProviderProps() []interface{} {
func (proto *protobufDecorator) SourceProviderDeps(ctx DepsContext, deps Deps) Deps {
deps = proto.BaseSourceProvider.SourceProviderDeps(ctx, deps)
- deps.Rustlibs = append(deps.Rustlibs, "libprotobuf")
+ deps.Rustlibs = append(deps.Rustlibs, "libprotobuf_deprecated")
deps.HeaderLibs = append(deps.SharedLibs, proto.Properties.Header_libs...)
if len(proto.Properties.Grpc_protos) > 0 {