From aa9159f937988f7026e3fe569bcafca07f8fbcd3 Mon Sep 17 00:00:00 2001
From: Mohannad Farrag <aymanm@google.com>
Date: Thu, 9 Mar 2023 11:32:13 +0000
Subject: [PATCH] gn2bp: Fix some protos include_dirs

* Some net files have different include_dirs for protos generated. If the generated file is at A/B/C/src/D/E. The net file expect the
export include dir to be A/B/C/src/

Test: None
Change-Id: I9ebe54094ea6bd2b00645be2bf724889dbcb3c1f
---
 tools/gn2bp/Android.bp.swp |  3 +++
 tools/gn2bp/gen_android_bp | 15 +++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index a0696d9c80..19901fa5e4 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -16734,6 +16734,7 @@ cc_genrule {
     ],
     export_include_dirs: [
         ".",
+        "net/third_party/quiche/src",
         "net/third_party/quiche/src/quiche/quic/test_tools",
         "protos",
     ],
@@ -16775,6 +16776,7 @@ cc_genrule {
     ],
     export_include_dirs: [
         ".",
+        "net/third_party/quiche/src",
         "net/third_party/quiche/src/quiche/quic/test_tools",
         "protos",
     ],
@@ -31817,6 +31819,7 @@ cc_genrule {
     export_include_dirs: [
         ".",
         "protos",
+        "third_party/quic_trace/src",
         "third_party/quic_trace/src/quic_trace",
     ],
     apex_available: [
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index df12d42bb2..b55b9bf6d1 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -167,6 +167,21 @@ def get_linker_script_ldflag(script_path):
 
 # Additional arguments to apply to Android.bp rules.
 additional_args = {
+    'cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers': [
+      ('export_include_dirs', {
+        "net/third_party/quiche/src",
+      })
+    ],
+    'cronet_aml_net_third_party_quiche_net_quic_test_tools_proto__testing_gen_headers': [
+        ('export_include_dirs', {
+        "net/third_party/quiche/src",
+        })
+     ],
+    'cronet_aml_third_party_quic_trace_quic_trace_proto__testing_gen_headers': [
+        ('export_include_dirs', {
+          "third_party/quic_trace/src",
+        })
+    ],
     'cronet_aml_net_net': [
         ('export_static_lib_headers', {
             'cronet_aml_net_third_party_quiche_quiche',