commit 982dd04e8d45d82fe5b92d50c3cd0c2d88d162ba
author Motomu Utsumi <motomuman@google.com> Fri Nov 04 18:49:45 2022 +0900
committer Motomu Utsumi <motomuman@google.com> Fri Nov 04 22:33:33 2022 +0900
tree d9bfdeaaa5067e2afd7b4ee2a3063fffad957146
parent c5d2db94b52912dafc359663c01d83281491a5c7

gn2bp: Set --cc-out-dir arg for protoc_wrapper.py

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

tools/gn2bp/Android.bp.swp

diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index 8b883ee..0a9784e 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -3432,7 +3432,7 @@
          "--proto-in-dir " +
          "`dirname $(location net/base/isolation_info.proto)` " +
          "--cc-out-dir " +
-         "gen/net/base " +
+         "$(genDir)/net/base " +
          "--py-out-dir " +
          "pyproto/net/base",
     out: [
@@ -4213,7 +4213,7 @@
          "--proto-in-dir " +
          "`dirname $(location net/nqe/proto/network_id_proto.proto)` " +
          "--cc-out-dir " +
-         "gen/net/nqe/proto " +
+         "$(genDir)/net/nqe/proto " +
          "--cc-options " +
          "dllexport_decl " +
          "NET_EXPORT_PRIVATE: " +
@@ -4439,7 +4439,7 @@
          "--proto-in-dir " +
          "`dirname $(location net/third_party/quiche/src/quiche/quic/core/proto/cached_network_parameters.proto)`/../../../../ " +
          "--cc-out-dir " +
-         "gen/net/third_party/quiche/src " +
+         "$(genDir)/net/third_party/quiche/src " +
          "--cc-options " +
          "dllexport_decl " +
          "COMPONENT_EXPORT(QUICHE): " +
@@ -4527,7 +4527,7 @@
          "--proto-in-dir " +
          "`dirname $(location net/third_party/quiche/src/quiche/quic/test_tools/send_algorithm_test_result.proto)` " +
          "--cc-out-dir " +
-         "gen/net/third_party/quiche/src/quiche/quic/test_tools " +
+         "$(genDir)/net/third_party/quiche/src/quiche/quic/test_tools " +
          "--cc-options " +
          "dllexport_decl " +
          "NET_EXPORT_PRIVATE: " +

tools/gn2bp/gen_android_bp

diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index 4286c62..a0cdb6c 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -871,6 +871,8 @@
         # Adjusting path for net_quic_proto_gen
         if target.name == "//net/third_party/quiche:net_quic_proto_gen":
           target.args[i + 1] += '/../../../../'
+      elif val == '--cc-out-dir':
+        target.args[i + 1] = re.sub('^gen', '$(genDir)', target.args[i + 1])
 
   script = gn_utils.label_to_path(target.script)
   module.tool_files.add(script)