diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index 75266ab..1422b69 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -677,8 +677,8 @@
   arg_string = ' '.join(target.args)
   module.cmd = '$(location %s) %s' % (script, arg_string)
 
-  # TODO: is this correct?
-  module.tool_files.extend(':' + label_to_module_name(it) for it in target.deps)
+  if all(os.path.splitext(it)[1] == '.h' for it in target.outputs):
+    module.genrule_headers.add(bp_module_name)
 
   # For gn actions, sources and inputs are treated equally.
   # TODO: there should be a label_to_path function that takes a set / list.