commit 26ef25d9ebef7e6ce9b932a10049b182a6af9b88
author Motomu Utsumi <motomuman@google.com> Fri Nov 04 18:30:19 2022 +0900
committer Motomu Utsumi <motomuman@google.com> Fri Nov 04 22:30:01 2022 +0900
tree b75bddc7f27ec6367b770084b03f18c74207f79b
parent dfc8e6a174f6d2e021b824782c05c025131afc8e

gn2bp: Use aprotoc in protoc_wrapper.py

Test: ./update_result.sh
Change-Id: I050ca54ca3f98a0fc6ced1f603b1db502c0a189c

tools/gn2bp/Android.bp.swp

diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index 1777802..c479c18 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -3213,9 +3213,12 @@
     srcs: [
         "net/cert/root_store.proto",
     ],
+    tools: [
+        "aprotoc",
+    ],
     cmd: "$(location tools/protoc_wrapper/protoc_wrapper.py) root_store.proto " +
          "--protoc " +
-         "./clang_x64/protoc " +
+         "$(location aprotoc) " +
          "--proto-in-dir " +
          "../../net/cert " +
          "--cc-out-dir " +
@@ -3420,9 +3423,12 @@
     srcs: [
         "net/base/isolation_info.proto",
     ],
+    tools: [
+        "aprotoc",
+    ],
     cmd: "$(location tools/protoc_wrapper/protoc_wrapper.py) isolation_info.proto " +
          "--protoc " +
-         "./clang_x64/protoc " +
+         "$(location aprotoc) " +
          "--proto-in-dir " +
          "../../net/base " +
          "--cc-out-dir " +
@@ -4198,9 +4204,12 @@
     srcs: [
         "net/nqe/proto/network_id_proto.proto",
     ],
+    tools: [
+        "aprotoc",
+    ],
     cmd: "$(location tools/protoc_wrapper/protoc_wrapper.py) network_id_proto.proto " +
          "--protoc " +
-         "./clang_x64/protoc " +
+         "$(location aprotoc) " +
          "--proto-in-dir " +
          "../../net/nqe/proto " +
          "--cc-out-dir " +
@@ -4419,11 +4428,14 @@
         "net/third_party/quiche/src/quiche/quic/core/proto/crypto_server_config.proto",
         "net/third_party/quiche/src/quiche/quic/core/proto/source_address_token.proto",
     ],
+    tools: [
+        "aprotoc",
+    ],
     cmd: "$(location tools/protoc_wrapper/protoc_wrapper.py) quiche/quic/core/proto/cached_network_parameters.proto " +
          "quiche/quic/core/proto/crypto_server_config.proto " +
          "quiche/quic/core/proto/source_address_token.proto " +
          "--protoc " +
-         "./clang_x64/protoc " +
+         "$(location aprotoc) " +
          "--proto-in-dir " +
          "../../net/third_party/quiche/src " +
          "--cc-out-dir " +
@@ -4506,9 +4518,12 @@
     srcs: [
         "net/third_party/quiche/src/quiche/quic/test_tools/send_algorithm_test_result.proto",
     ],
+    tools: [
+        "aprotoc",
+    ],
     cmd: "$(location tools/protoc_wrapper/protoc_wrapper.py) send_algorithm_test_result.proto " +
          "--protoc " +
-         "./clang_x64/protoc " +
+         "$(location aprotoc) " +
          "--proto-in-dir " +
          "../../net/third_party/quiche/src/quiche/quic/test_tools " +
          "--cc-out-dir " +