diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index 87b9a59..75bbcf1 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -749,6 +749,9 @@
 
 class JniRegistrationGeneratorSanitizer(BaseActionSanitizer):
   def get_args(self):
+    self._update_value_arg('--depfile', self._sanitize_filepath)
+    self._update_value_arg('--srcjar-path', self._sanitize_filepath)
+    self._update_value_arg('--header-path', self._sanitize_filepath)
     return super().get_args()
 
 def get_action_sanitizer(target):
@@ -816,8 +819,6 @@
 
     target.inputs = [file for file in target.inputs if not file.startswith('//out/')]
     for i, val in enumerate(target.args):
-      if val in ['--depfile', '--srcjar-path', '--header-path']:
-        target.args[i + 1] = re.sub('^gen', '$(genDir)', target.args[i + 1])
       if val == '--sources-files':
         target.args[i + 1] = '$(genDir)/java.sources'
       elif val == '--sources-exclusions':