diff options
Diffstat (limited to 'rust/protobuf.go')
| -rw-r--r-- | rust/protobuf.go | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/rust/protobuf.go b/rust/protobuf.go index e30f25d95..0cf6e8c97 100644 --- a/rust/protobuf.go +++ b/rust/protobuf.go @@ -52,6 +52,10 @@ type ProtobufProperties struct { // List of libraries which export include paths required for this module Header_libs []string `android:"arch_variant,variant_prepend"` + + // Use protobuf version 3.x. This will be deleted once we migrate all current users + // of protobuf off of 2.x. + Use_protobuf3 *bool } type protobufDecorator struct { @@ -65,6 +69,10 @@ type protobufDecorator struct { protoFlags android.ProtoFlags } +func (proto *protobufDecorator) useProtobuf3() bool { + return Bool(proto.Properties.Use_protobuf3) +} + func (proto *protobufDecorator) GenerateSource(ctx ModuleContext, deps PathDeps) android.Path { var protoFlags android.ProtoFlags var grpcProtoFlags android.ProtoFlags @@ -73,7 +81,13 @@ 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) + + // For now protobuf2 (the deprecated version) remains the default. This will change in the + // future as we update the various users. protoPluginPath := ctx.Config().HostToolPath(ctx, "protoc-gen-rust-deprecated") + if proto.useProtobuf3() == true { + protoPluginPath = ctx.Config().HostToolPath(ctx, "protoc-gen-rust") + } commonProtoFlags = append(commonProtoFlags, defaultProtobufFlags...) commonProtoFlags = append(commonProtoFlags, proto.Properties.Proto_flags...) @@ -206,10 +220,20 @@ 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_deprecated") + useProtobuf3 := proto.useProtobuf3() + if useProtobuf3 == true { + deps.Rustlibs = append(deps.Rustlibs, "libprotobuf") + } else { + deps.Rustlibs = append(deps.Rustlibs, "libprotobuf_deprecated") + } deps.HeaderLibs = append(deps.SharedLibs, proto.Properties.Header_libs...) if len(proto.Properties.Grpc_protos) > 0 { + if useProtobuf3 == true { + ctx.PropertyErrorf("protos", "rust_protobuf with grpc_protos defined must currently use "+ + "`use_protobuf3: false,` in the Android.bp file. This is temporary until the "+ + "grpcio crate is updated to use the current version of the protobuf crate.") + } deps.Rustlibs = append(deps.Rustlibs, "libgrpcio", "libfutures") deps.HeaderLibs = append(deps.HeaderLibs, "libprotobuf-cpp-full") } |