joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

gn2bp: Fix some protos include_dirs

Browse source 
* 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
This commit is contained in:
Mohannad Farrag 2023-03-09 11:32:13 +00:00
commit aa9159f937
2 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tools/gn2bp/Android.bp.swp
View file

@ -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: [

15
tools/gn2bp/gen_android_bp
View file

@ -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',