diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index 47606a8..5a22689 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -2613,7 +2613,7 @@
          "VERSION_FULL='\"%s.%s.%s.%s\" % (MAJOR,MINOR,BUILD,PATCH)' " +
          " " +
          "-o " +
-         "gen/components/cronet/version.h " +
+         "$(out) " +
          "$(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 6df7457..6f755ca 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -914,7 +914,8 @@
         # arg for -e EVAL option should be passed in -e PATCH_HI=int(PATCH)//256 format.
         target.args[i + 1] = '%s=\'%s\'' % (target.args[i + 1], target.args[i + 2])
         target.args[i + 2] = ''
-
+      elif val == '-o':
+        target.args[i + 1] = '$(out)'
 
   script = gn_utils.label_to_path(target.script)
   module.tool_files.add(script)