Rust protobuf 2->3: Update build system
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:
committed by
Cherrypicker Worker
parent
a4a923019d
commit
28216dbe8d
@@ -21,54 +21,6 @@ import (
|
||||
"android/soong/android"
|
||||
)
|
||||
|
||||
func TestRustProtobuf(t *testing.T) {
|
||||
ctx := testRust(t, `
|
||||
rust_protobuf {
|
||||
name: "librust_proto",
|
||||
protos: ["buf.proto", "proto.proto"],
|
||||
crate_name: "rust_proto",
|
||||
source_stem: "buf",
|
||||
shared_libs: ["libfoo_shared"],
|
||||
static_libs: ["libfoo_static"],
|
||||
}
|
||||
cc_library_shared {
|
||||
name: "libfoo_shared",
|
||||
export_include_dirs: ["shared_include"],
|
||||
}
|
||||
cc_library_static {
|
||||
name: "libfoo_static",
|
||||
export_include_dirs: ["static_include"],
|
||||
}
|
||||
`)
|
||||
// Check that libprotobuf is added as a dependency.
|
||||
librust_proto := ctx.ModuleForTests("librust_proto", "android_arm64_armv8-a_dylib").Module().(*Module)
|
||||
if !android.InList("libprotobuf_deprecated", librust_proto.Properties.AndroidMkDylibs) {
|
||||
t.Errorf("libprotobuf_deprecated dependency missing for rust_protobuf (dependency missing from AndroidMkDylibs)")
|
||||
}
|
||||
|
||||
// Make sure the correct plugin is being used.
|
||||
librust_proto_out := ctx.ModuleForTests("librust_proto", "android_arm64_armv8-a_source").Output("buf.rs")
|
||||
cmd := librust_proto_out.RuleParams.Command
|
||||
if w := "protoc-gen-rust-deprecated"; !strings.Contains(cmd, w) {
|
||||
t.Errorf("expected %q in %q", w, cmd)
|
||||
}
|
||||
|
||||
// Check exported include directories
|
||||
if w := "-Ishared_include"; !strings.Contains(cmd, w) {
|
||||
t.Errorf("expected %q in %q", w, cmd)
|
||||
}
|
||||
if w := "-Istatic_include"; !strings.Contains(cmd, w) {
|
||||
t.Errorf("expected %q in %q", w, cmd)
|
||||
}
|
||||
|
||||
// Check proto.rs, the second protobuf, is listed as an output
|
||||
librust_proto_outputs := ctx.ModuleForTests("librust_proto", "android_arm64_armv8-a_source").AllOutputs()
|
||||
if android.InList("proto.rs", librust_proto_outputs) {
|
||||
t.Errorf("rust_protobuf is not producing multiple outputs; expected 'proto.rs' in list, got: %#v ",
|
||||
librust_proto_outputs)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRustProtobuf3(t *testing.T) {
|
||||
ctx := testRust(t, `
|
||||
rust_protobuf {
|
||||
|
Reference in New Issue
Block a user