diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index d1b6ad0..ad27c14 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -2608,13 +2608,13 @@
 genrule {
     name: "cronet_aml_components_cronet_cronet_version_header_action",
     cmd: "$(location build/util/version.py) -f " +
-         "../../chrome/VERSION " +
+         "$(location chrome/VERSION) " +
          "-e " +
          "VERSION_FULL " +
          "\"%s.%s.%s.%s\" % (MAJOR,MINOR,BUILD,PATCH) " +
          "-o " +
          "gen/components/cronet/version.h " +
-         "../../components/cronet/version.h.in",
+         "$(location components/cronet/version.h.in)",
     out: [
         "components/cronet/version.h",
     ],
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index 286837d..4cf4b7d 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -903,6 +903,12 @@
     # This script generates .cc files but source (registry_controlled_domain.cc) in the target that
     # depends on this target includes .cc file this script generates.
     module.genrule_headers.add(module.name)
+  elif target.script == "//build/util/version.py":
+    for i, val in enumerate(target.args):
+      if val.startswith('../../'):
+        filename = re.sub('^\.\./\.\./', '', val)
+        target.args[i] = '$(location %s)' % filename
+
 
   script = gn_utils.label_to_path(target.script)
   module.tool_files.add(script)