diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index f72f4be..e3df3c4 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -758,6 +758,10 @@
     self._delete_value_arg('--sources-exclusions')
     return super().get_args()
 
+class VersionSanitizer(BaseActionSanitizer):
+  def get_args(self):
+    return super().get_args()
+
 def get_action_sanitizer(target):
   if target.script == "//build/write_buildflag_header.py":
     return WriteBuildFlagHeaderSanitizer(target)
@@ -767,6 +771,8 @@
     return JniGeneratorSanitizer(target)
   elif target.script == '//base/android/jni_generator/jni_registration_generator.py':
     return JniRegistrationGeneratorSanitizer(target)
+  elif target.script == "//build/util/version.py":
+    return VersionSanitizer(target)
   else:
     # TODO: throw exception here once all script hacks have been converted.
     return BaseActionSanitizer(target)
