commit 4a2a068a95bc1aab6c8f97a1f22d77eea853b395
author Scott Graham <scottmg@chromium.org> Mon Jun 11 09:28:19 2018 -0700
committer Petr Hosek <phosek@google.com> Tue Jun 12 03:13:03 2018 +0000
tree 1839a252b63cf5165a314cce8ed06c4e15fb7b36
parent 00aca57145729fea1bb45ee6d621f94bfd15fa60

Update recipe for new build generation location

Change-Id: I8993b5d4b7551b9e65686e70c0d62eafabf4ec10
Reviewed-on: https://gn-review.googlesource.com/1280
Reviewed-by: Petr Hosek <phosek@google.com>

infra/recipes/gn.expected/ci_win.json

diff --git a/infra/recipes/gn.expected/ci_win.json b/infra/recipes/gn.expected/ci_win.json
index 08a77d3..28b0330 100644
--- a/infra/recipes/gn.expected/ci_win.json
+++ b/infra/recipes/gn.expected/ci_win.json
@@ -70,18 +70,41 @@
     ]
   },
   {
+    "cmd": [],
+    "name": "build"
+  },
+  {
     "cmd": [
       "python",
       "-u",
-      "[START_DIR]\\gn\\tools\\gn\\bootstrap\\bootstrap.py",
-      "--no-rebuild"
+      "[START_DIR]\\gn\\build\\gen.py"
+    ],
+    "cwd": "[START_DIR]\\gn",
+    "env_prefixes": {
+      "PATH": [
+        "[START_DIR]\\cipd"
+      ]
+    },
+    "name": "build.generate",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "ninja",
+      "-C",
+      "[START_DIR]\\gn\\out"
     ],
     "env_prefixes": {
       "PATH": [
         "[START_DIR]\\cipd"
       ]
     },
-    "name": "bootstrap"
+    "name": "build.ninja",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
   },
   {
     "name": "$result",