pw_rpc: Add --no-experimental-editions to protobuf compiler options

The underlying option is not supported currently in Android, so we disable it with this flag. Change-Id: I9d2572555064e0f663e3b5cc408e46a3b11e529d Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/238252 Lint: Lint 🤖 <[email protected]> Docs-Not-Needed: Matthew Sedam <[email protected]> Commit-Queue: Matthew Sedam <[email protected]> Reviewed-by: Carlos Chinchilla <[email protected]>
google · Sep 26, 2024 · bbd82e3 · bbd82e3
1 parent 1dc9a78
commit bbd82e3
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 0 deletions.
diff --git a/pw_log/Android.bp b/pw_log/Android.bp
@@ -92,6 +92,7 @@ genrule {
         "--sources $(location :pw_log_log_proto_with_prefix) " +
         "--language pwpb " +
         "--no-experimental-proto3-optional " +
+        "--no-experimental-editions " +
         "--protoc=$(location aprotoc) && " +
         // TODO(b/308678575) - Avoid making an extra copy of the created file.
         "python3 -c \"import os; import shutil; " +
@@ -125,6 +126,7 @@ genrule {
         "--sources $(location :pw_log_log_proto_with_prefix) " +
         "--language pwpb_rpc " +
         "--no-experimental-proto3-optional " +
+        "--no-experimental-editions " +
         "--protoc=$(location aprotoc) && " +
         // TODO(b/308678575) - Avoid making an extra copy of the created file.
         "python3 -c \"import os; import shutil; " +
@@ -158,6 +160,7 @@ genrule {
         "--sources $(location :pw_log_log_proto_with_prefix) " +
         "--language raw_rpc " +
         "--no-experimental-proto3-optional " +
+        "--no-experimental-editions " +
         "--protoc=$(location aprotoc) && " +
         // TODO(b/308678575) - Avoid making an extra copy of the created file.
         "python3 -c \"import os; import shutil; " +

diff --git a/pw_protobuf/Android.bp b/pw_protobuf/Android.bp
@@ -97,6 +97,7 @@ genrule {
         "--sources $(in) " +
         "--language nanopb " +
         "--no-experimental-proto3-optional " +
+        "--no-experimental-editions " +
         "--protoc=$(location aprotoc) ",
     out: [
         "pw_protobuf_protos/common.pb.h",
@@ -147,6 +148,7 @@ genrule {
         "--sources $(in) " +
         "--language pwpb " +
         "--no-experimental-proto3-optional " +
+        "--no-experimental-editions " +
         "--protoc=$(location aprotoc) ",
     out: [
         "pw_protobuf_protos/common.pwpb.h",
@@ -177,6 +179,7 @@ genrule {
         "--sources $${proto_files} " +
         "--language pwpb " +
         "--no-experimental-proto3-optional " +
+        "--no-experimental-editions " +
         "--protoc=$(location aprotoc) ",
     out: [
         "google/protobuf/descriptor.pwpb.h",

diff --git a/pw_rpc/Android.bp b/pw_rpc/Android.bp
@@ -182,6 +182,7 @@ genrule {
         "--sources $(in) " +
         "--language pwpb " +
         "--no-experimental-proto3-optional " +
+        "--no-experimental-editions " +
         "--protoc=$(location aprotoc) ",
     out: [
         "pw_rpc/internal/packet.pwpb.h",
@@ -203,6 +204,7 @@ genrule {
         "--language python " +
         "--no-generate-type-hints " +
         "--no-experimental-proto3-optional " +
+        "--no-experimental-editions " +
         "--protoc=$(location aprotoc)",
     out: [
         "packet_pb2.py",
@@ -237,6 +239,7 @@ genrule_defaults {
         "--language nanopb " +
         "--sources $${proto_files} " +
         "--no-experimental-proto3-optional " +
+        "--no-experimental-editions " +
         "--protoc=$(location aprotoc)",
     tools: [
         "aprotoc",
@@ -278,6 +281,7 @@ genrule_defaults {
         "--language nanopb " +
         "--sources $${proto_files} " +
         "--no-experimental-proto3-optional " +
+        "--no-experimental-editions " +
         "--protoc=$(location aprotoc)",
     tools: [
         "aprotoc",
@@ -302,6 +306,7 @@ genrule_defaults {
         "--language nanopb_rpc " +
         "--sources $(in) " +
         "--no-experimental-proto3-optional " +
+        "--no-experimental-editions " +
         "--protoc=$(location aprotoc)",
     tools: [
         "aprotoc",
@@ -343,6 +348,7 @@ genrule_defaults {
         "--language nanopb_rpc " +
         "--sources $${proto_files} " +
         "--no-experimental-proto3-optional " +
+        "--no-experimental-editions " +
         "--protoc=$(location aprotoc)",
     tools: [
         "aprotoc",
@@ -363,6 +369,7 @@ genrule_defaults {
         "--language raw_rpc " +
         "--sources $(in) " +
         "--no-experimental-proto3-optional " +
+        "--no-experimental-editions " +
         "--protoc=$(location aprotoc)",
     tools: [
         "aprotoc",
@@ -393,6 +400,7 @@ genrule_defaults {
         "--language raw_rpc " +
         "--sources $${proto_files} " +
         "--no-experimental-proto3-optional " +
+        "--no-experimental-editions " +
         "--protoc=$(location aprotoc)",
     tools: [
         "aprotoc",
@@ -413,6 +421,7 @@ genrule_defaults {
         "--language pwpb " +
         "--sources $(in) " +
         "--no-experimental-proto3-optional " +
+        "--no-experimental-editions " +
         "--protoc=$(location aprotoc)",
     tools: [
         "aprotoc",
@@ -443,6 +452,7 @@ genrule_defaults {
         "--language pwpb " +
         "--sources $${proto_files} " +
         "--no-experimental-proto3-optional " +
+        "--no-experimental-editions " +
         "--protoc=$(location aprotoc)",
     tools: [
         "aprotoc",
@@ -463,6 +473,7 @@ genrule_defaults {
         "--language pwpb_rpc " +
         "--sources $(in) " +
         "--no-experimental-proto3-optional " +
+        "--no-experimental-editions " +
         "--protoc=$(location aprotoc)",
     tools: [
         "aprotoc",
@@ -493,6 +504,7 @@ genrule_defaults {
         "--language pwpb_rpc " +
         "--sources $${proto_files} " +
         "--no-experimental-proto3-optional " +
+        "--no-experimental-editions " +
         "--protoc=$(location aprotoc)",
     tools: [
         "aprotoc",

diff --git a/pw_tokenizer/Android.bp b/pw_tokenizer/Android.bp
@@ -171,6 +171,7 @@ genrule {
         "--sources $(location pw_tokenizer_proto/options.proto) " +
         "--language pwpb " +
         "--no-experimental-proto3-optional " +
+        "--no-experimental-editions " +
         "--protoc=$(location aprotoc) ",
     out: [
         "pw_tokenizer_proto/options.pwpb.h",