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

Merge "Remove unused use_protobuf3 flag" into main

Browse Source
This commit is contained in:
Ludovic Barman
2023-12-21 21:57:45 +00:00
committed by Gerrit Code Review
parent c7acd4858b 78b2519e19
commit aa5d9b43f9
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rust/protobuf.go
View File

@@ -54,11 +54,6 @@ type ProtobufProperties struct {
// List of libraries which export include paths required for this module // List of libraries which export include paths required for this module
Header_libs []string `android:"arch_variant,variant_prepend"` 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. // List of exported include paths containing proto files for dependent rust_protobuf modules.
Exported_include_dirs []string Exported_include_dirs []string
} }

3
rust/protobuf_test.go
View File

@@ -28,7 +28,6 @@ func TestRustProtobuf3(t *testing.T) {
protos: ["buf.proto", "proto.proto"], protos: ["buf.proto", "proto.proto"],
crate_name: "rust_proto", crate_name: "rust_proto",
source_stem: "buf", source_stem: "buf",
use_protobuf3: true,
shared_libs: ["libfoo_shared"], shared_libs: ["libfoo_shared"],
static_libs: ["libfoo_static"], static_libs: ["libfoo_static"],
} }
@@ -77,7 +76,6 @@ func TestRustProtobufInclude(t *testing.T) {
protos: ["proto.proto"], protos: ["proto.proto"],
crate_name: "rust_proto", crate_name: "rust_proto",
source_stem: "proto", source_stem: "proto",
use_protobuf3: true,
rustlibs: ["librust_exported_proto", "libfoo"], rustlibs: ["librust_exported_proto", "libfoo"],
} }
rust_protobuf { rust_protobuf {
@@ -85,7 +83,6 @@ func TestRustProtobufInclude(t *testing.T) {
protos: ["proto.proto"], protos: ["proto.proto"],
crate_name: "rust_exported_proto", crate_name: "rust_exported_proto",
source_stem: "exported_proto", source_stem: "exported_proto",
use_protobuf3: true,
exported_include_dirs: ["proto"] exported_include_dirs: ["proto"]
} }
rust_library { rust_library {