diff options
| author | 2023-12-16 09:02:24 +0000 | |
|---|---|---|
| committer | 2023-12-21 17:53:51 +0000 | |
| commit | 78b2519e1937c31fef40ef5a3f064f10d7495566 (patch) | |
| tree | fdacc159b71d5cff484be8c25c1c4fe5b0f6ef9a | |
| parent | bdfb169e90f4bb687cfa7345a4bf1458ae9709c8 (diff) | |
Remove unused use_protobuf3 flag
This is a No-op.
Protobuf3 is used regardless of this flag since https://android-review.git.corp.google.com/c/platform/build/soong/+/2817733
Test: m rust
Bug: 308790516
Change-Id: I1bfbca5d8a30e4e10f03e4e045d6c6ceddb30c87
| -rw-r--r-- | rust/protobuf.go | 5 | ||||
| -rw-r--r-- | rust/protobuf_test.go | 3 |
2 files changed, 0 insertions, 8 deletions
diff --git a/rust/protobuf.go b/rust/protobuf.go index d021076eb..0b26b80fa 100644 --- a/rust/protobuf.go +++ b/rust/protobuf.go @@ -54,11 +54,6 @@ 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. - // ludovicb@: DEPRECATED, to be removed - Use_protobuf3 *bool - // List of exported include paths containing proto files for dependent rust_protobuf modules. Exported_include_dirs []string } diff --git a/rust/protobuf_test.go b/rust/protobuf_test.go index b375a6463..cae071b8f 100644 --- a/rust/protobuf_test.go +++ b/rust/protobuf_test.go @@ -28,7 +28,6 @@ func TestRustProtobuf3(t *testing.T) { protos: ["buf.proto", "proto.proto"], crate_name: "rust_proto", source_stem: "buf", - use_protobuf3: true, shared_libs: ["libfoo_shared"], static_libs: ["libfoo_static"], } @@ -77,7 +76,6 @@ func TestRustProtobufInclude(t *testing.T) { protos: ["proto.proto"], crate_name: "rust_proto", source_stem: "proto", - use_protobuf3: true, rustlibs: ["librust_exported_proto", "libfoo"], } rust_protobuf { @@ -85,7 +83,6 @@ func TestRustProtobufInclude(t *testing.T) { protos: ["proto.proto"], crate_name: "rust_exported_proto", source_stem: "exported_proto", - use_protobuf3: true, exported_include_dirs: ["proto"] } rust_library { |