Merge "gn2bp: Fix some protos include_dirs" am: 327b8dd91d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2484287
Change-Id: I32b77c08793e5029af046904893dbac6a47749da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index a0696d9..19901fa 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -16734,6 +16734,7 @@
],
export_include_dirs: [
".",
+ "net/third_party/quiche/src",
"net/third_party/quiche/src/quiche/quic/test_tools",
"protos",
],
@@ -16775,6 +16776,7 @@
],
export_include_dirs: [
".",
+ "net/third_party/quiche/src",
"net/third_party/quiche/src/quiche/quic/test_tools",
"protos",
],
@@ -31817,6 +31819,7 @@
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 df12d42..b55b9bf 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -167,6 +167,21 @@
# 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',