StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rust protobuf 2->3: Update build system

Browse Source 
tldr: remove protobuf2 from Android Rust and upgrade everything to pb3.

These commits update:
- The grpcio rust crate to use protobuf 3
- The build system to always use the new libprotobuf (pb3) instead of the _deprecated variant (for pb2); they also force-enable libprotobuf everywhere, ignoring the use_protobuf3 flag, removes the tests related to pb2
- The following modules, which required syntax changes:
-- packages/modules/Bluetooth
-- device/google/cuttlefish
-- vendor/auto

Bug: 308790516
Test: m rust
Ignore-AOSP-First: must be done in main to upgrade cuttlefish+vendor with the rest all at once
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7d0783ce22b3d7d369786d4b16067c79c033185b)
Merged-In: I1d07c433aca41ccfe2e710821cf930c413dc12d6

Change-Id: I1d07c433aca41ccfe2e710821cf930c413dc12d6
This commit is contained in:
Ludovic Barman
2023-11-04 15:13:49 +00:00
parent a6bc7c87bd
commit 19739bf6a5
3 changed files with 4 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
rust/protobuf.go
View File

@@ -56,6 +56,7 @@ type ProtobufProperties struct {
// Use protobuf version 3.x. This will be deleted once we migrate all current users
// of protobuf off of 2.x.
// ludovicb@: DEPRECATED, to be removed
Use_protobuf3 *bool
// List of exported include paths containing proto files for dependent rust_protobuf modules.
@@ -74,10 +75,6 @@ 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
@@ -87,12 +84,7 @@ func (proto *protobufDecorator) GenerateSource(ctx ModuleContext, deps PathDeps)
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")
}
protoPluginPath := ctx.Config().HostToolPath(ctx, "protoc-gen-rust")
commonProtoFlags = append(commonProtoFlags, defaultProtobufFlags...)
commonProtoFlags = append(commonProtoFlags, proto.Properties.Proto_flags...)
@@ -216,13 +208,7 @@ func (proto *protobufDecorator) genModFileContents() string {
lines = append(
lines,
"pub mod empty {",
" pub use protobuf::well_known_types::Empty;",
"}",
"pub mod wrappers {",
" pub use protobuf::well_known_types::{",
" DoubleValue, FloatValue, Int64Value, UInt64Value, Int32Value, UInt32Value,",
" BoolValue, StringValue, BytesValue",
" };",
" pub use protobuf::well_known_types::empty::Empty;",
"}")
}
@@ -235,20 +221,10 @@ func (proto *protobufDecorator) SourceProviderProps() []interface{} {
func (proto *protobufDecorator) SourceProviderDeps(ctx DepsContext, deps Deps) Deps {
deps = proto.BaseSourceProvider.SourceProviderDeps(ctx, deps)
useProtobuf3 := proto.useProtobuf3()
if useProtobuf3 == true {
deps.Rustlibs = append(deps.Rustlibs, "libprotobuf")
} else {
deps.Rustlibs = append(deps.Rustlibs, "libprotobuf_deprecated")
}
deps.Rustlibs = append(deps.Rustlibs, "libprotobuf")
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")
}