kleaf: bazel.py move startup options into parse_command_args.

This is so that we can use --cache_dir instead of
the fixed label //build/kernel/kleaf:cache_dir later.

Test: TH
Bug: 293260835
Change-Id: I1df9703382d01014525e88be3ab85718c6f453ac

1 files changed, 13 insertions, 10 deletions

diff --git a/kleaf/bazel.py b/kleaf/bazel.py
index 2b6e485..7c2a6d8 100755
--- a/kleaf/bazel.py
+++ b/kleaf/bazel.py
@@ -298,30 +298,33 @@ class BazelWrapper(object):
         if self.known_args.user_clang_toolchain is not None:
             self.env["KLEAF_USER_CLANG_TOOLCHAIN_PATH"] = self.known_args.user_clang_toolchain
 
-        cache_dir_bazel_rc = self.absolute_out_dir / "bazel/cache_dir.bazelrc"
-        os.makedirs(os.path.dirname(cache_dir_bazel_rc), exist_ok=True)
-        with open(cache_dir_bazel_rc, "w") as f:
+        bazel_jdk_path = self.kleaf_repo_dir / _BAZEL_JDK_REL_PATH
+        self.transformed_startup_options.append(
+            f"--server_javabase={bazel_jdk_path}"
+        )
+
+        cache_dir_bazelrc = self.absolute_out_dir / "bazel/cache_dir.bazelrc"
+        os.makedirs(os.path.dirname(cache_dir_bazelrc), exist_ok=True)
+        with open(cache_dir_bazelrc, "w") as f:
             f.write(textwrap.dedent(f"""\
                 build --//build/kernel/kleaf:cache_dir={shlex.quote(str(self.known_args.cache_dir))}
             """))
 
         if not self.known_startup_options.help:
             self.transformed_startup_options.append(
-                f"--bazelrc={cache_dir_bazel_rc}")
+                f"--bazelrc={cache_dir_bazelrc}")
+
+        self.transformed_startup_options.append(
+            f"--bazelrc={self.kleaf_repo_dir}/{_BAZEL_RC_NAME}"
+        )
 
     def _build_final_args(self) -> list[str]:
         """Builds the final arguments for the subprocess."""
         # final_args:
         # bazel [startup_options] [additional_startup_options] command [transformed_command_args] -- [target_patterns]
 
-        bazel_jdk_path = self.kleaf_repo_dir / _BAZEL_JDK_REL_PATH
         final_args = [self.bazel_path] + self.transformed_startup_options
 
-        if not self.known_startup_options.help:
-            final_args += [
-                f"--server_javabase={bazel_jdk_path}",
-                f"--bazelrc={self.kleaf_repo_dir / _BAZEL_RC_NAME}",
-            ]
         if self.command is not None:
             final_args.append(self.command)
         final_args += self.transformed_command_args