Version 3.4.0-199.0.dev

Merge a257981 into dev
dart-lang · Mar 5, 2024 · b60ba5e · b60ba5e
2 parents e18575c + a257981
commit b60ba5e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/sdk_args.gni b/sdk_args.gni
@@ -19,12 +19,7 @@ declare_args() {
   # to out/ReleaseX64/args.gn. The path above can be extracted from the `.git`
   # file under the git worktree folder.
   # The script run here should take care of everything automatically though.
-  default_git_folder = exec_script("$_dart_root/tools/get_dot_git_folder.py",
-                                   [
-                                     rebase_path("$_dart_root/.git"),
-                                     "$_dart_root/.git",
-                                   ],
-                                   "trim string")
+  default_git_folder = ""
 
   # Whether to enable the SDK hash check that will prevent loading a kernel
   # into a VM which was built with a different SDK.
@@ -34,6 +29,15 @@ declare_args() {
   dart_sdk_output = "dart-sdk"
 }
 
+if (default_git_folder == "") {
+  default_git_folder = exec_script("$_dart_root/tools/get_dot_git_folder.py",
+                                   [
+                                     rebase_path("$_dart_root/.git"),
+                                     "$_dart_root/.git",
+                                   ],
+                                   "trim string")
+}
+
 # The SDK hash to build into VM and kernels.
 # The value 0000000000 signifies no hash is set, which will disable the check.
 if (verify_sdk_hash) {

diff --git a/tools/VERSION b/tools/VERSION
@@ -27,5 +27,5 @@ CHANNEL dev
 MAJOR 3
 MINOR 4
 PATCH 0
-PRERELEASE 198
+PRERELEASE 199
 PRERELEASE_PATCH 0