diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index 3e9ebac..fef2be6 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -873,6 +873,7 @@
         "cronet_aml_base_allocator_partition_allocator_logging_buildflags",
         "cronet_aml_base_allocator_partition_allocator_partition_alloc_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
+        "cronet_aml_base_android_runtime_jni_headers",
         "cronet_aml_base_base_jni_headers",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
@@ -902,6 +903,7 @@
         "cronet_aml_base_allocator_partition_allocator_logging_buildflags",
         "cronet_aml_base_allocator_partition_allocator_partition_alloc_buildflags",
         "cronet_aml_base_anchor_functions_buildflags",
+        "cronet_aml_base_android_runtime_jni_headers",
         "cronet_aml_base_base_jni_headers",
         "cronet_aml_base_build_date",
         "cronet_aml_base_cfi_buildflags",
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index 5e1a0fd..06f8a90 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -918,6 +918,18 @@
 
     dep_module = create_modules_from_target(blueprint, gn, dep_name)
 
+    # TODO: Proper dependency check for genrule.
+    # Currently, only propagating genrule dependencies.
+    # Also, currently, all the dependencies are propagated upwards.
+    # in gn, public_deps should be propagated but deps should not.
+    # Not sure this information is available in the desc.json.
+    # Following rule works for adding android_runtime_jni_headers to base:base.
+    # If this doesn't work for other target, hardcoding for specific target
+    # might be better.
+    if module.type == "genrule" and dep_module.type == "genrule":
+        module.genrule_headers.add(dep_module.name)
+        module.genrule_headers.update(dep_module.genrule_headers)
+
     # For filegroups and genrule, recurse but don't apply the deps.
     if not module_is_compiled:
       continue