diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index f679a09..941c6ec 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -4202,6 +4202,7 @@
 genrule {
     name: "cronet_aml_net_net_nqe_proto_gen",
     srcs: [
+        "net/base/net_export.h",
         "net/nqe/proto/network_id_proto.proto",
     ],
     tools: [
@@ -4218,7 +4219,7 @@
          "dllexport_decl=NET_EXPORT_PRIVATE: " +
          " " +
          "--include " +
-         "net/base/net_export.h " +
+         "$(location net/base/net_export.h) " +
          "--py-out-dir " +
          "pyproto/net/nqe/proto",
     out: [
@@ -4424,6 +4425,7 @@
 genrule {
     name: "cronet_aml_net_third_party_quiche_net_quic_proto_gen",
     srcs: [
+        "base/component_export.h",
         "net/third_party/quiche/src/quiche/quic/core/proto/cached_network_parameters.proto",
         "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",
@@ -4444,7 +4446,7 @@
          "dllexport_decl=COMPONENT_EXPORT(QUICHE): " +
          " " +
          "--include " +
-         "base/component_export.h " +
+         "$(location base/component_export.h) " +
          "--py-out-dir " +
          "pyproto/net/third_party/quiche/src",
     out: [
@@ -4516,6 +4518,7 @@
 genrule {
     name: "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen",
     srcs: [
+        "net/base/net_export.h",
         "net/third_party/quiche/src/quiche/quic/test_tools/send_algorithm_test_result.proto",
     ],
     tools: [
@@ -4532,7 +4535,7 @@
          "dllexport_decl=NET_EXPORT_PRIVATE: " +
          " " +
          "--include " +
-         "net/base/net_export.h " +
+         "$(location net/base/net_export.h) " +
          "--py-out-dir " +
          "pyproto/net/third_party/quiche/src/quiche/quic/test_tools",
     out: [
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index ac629ba..0d59c4f 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -877,6 +877,12 @@
         # Needs to be dllexport_decl=value format
         target.args[i] += '=' + target.args[i+1]
         target.args[i+1] = ''
+      elif val == '--include':
+        # This file can be got from filegroup this target depends on, but currently we don't add .h
+        # files to the srcs. So far this is the only case .h files need to be added to the srcs.
+        # So, for now, adding specific for this target.
+        module.srcs.add(target.args[i+1])
+        target.args[i + 1] = '$(location %s)' % target.args[i + 1]
 
   script = gn_utils.label_to_path(target.script)
   module.tool_files.add(script)