commit a518d1170bf5f9475a758c3b89df9da4aed9394d
author Godofredo Contreras <godofredoc@google.com> Tue Jun 15 19:51:05 2021 +0000
committer CQ Bot Account <flutter-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Jun 15 19:51:05 2021 +0000
tree cfb6f2a0b9aa899bd3e339209134a0f178bf2a0c
parent 168343b0ae977fea1df0bc8acda3366983f3dd44

Builds sky_engine and sky_services inside a goma context.

The new version of depot_tools requires to run autoninja from inside a
goma context. This CL is moving the build steps to the recipe to ensure
a clean separation of build and tests.

Change-Id: I96589979add8cff21712ffa3f5adbda8a8339830
Bug: https://github.com/flutter/flutter/issues/84618
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/14683
Reviewed-by: Keyong Han <keyonghan@google.com>
Reviewed-by: Dan Field <dnfield@google.com>
Commit-Queue: Godofredo Contreras <godofredoc@google.com>

recipes/engine_unopt.expected/linux.json

diff --git a/recipes/engine_unopt.expected/linux.json b/recipes/engine_unopt.expected/linux.json
index 29b684a..3b1183d 100644
--- a/recipes/engine_unopt.expected/linux.json
+++ b/recipes/engine_unopt.expected/linux.json
@@ -436,7 +436,9 @@
       "1024",
       "-C",
       "[CACHE]/builder/src/out/host_debug_unopt",
-      "generate_dart_ui"
+      "generate_dart_ui",
+      "sky_engine",
+      "sky_services"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -460,7 +462,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "build host_debug_unopt generate_dart_ui"
+    "name": "build host_debug_unopt generate_dart_ui sky_engine sky_services"
   },
   {
     "cmd": [],

recipes/engine_unopt.expected/linux_lto.json

diff --git a/recipes/engine_unopt.expected/linux_lto.json b/recipes/engine_unopt.expected/linux_lto.json
index 6bb770f..a5d5ac0 100644
--- a/recipes/engine_unopt.expected/linux_lto.json
+++ b/recipes/engine_unopt.expected/linux_lto.json
@@ -435,7 +435,9 @@
       "1024",
       "-C",
       "[CACHE]/builder/src/out/host_debug_unopt",
-      "generate_dart_ui"
+      "generate_dart_ui",
+      "sky_engine",
+      "sky_services"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -459,7 +461,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "build host_debug_unopt generate_dart_ui"
+    "name": "build host_debug_unopt generate_dart_ui sky_engine sky_services"
   },
   {
     "cmd": [],

recipes/engine_unopt.py

diff --git a/recipes/engine_unopt.py b/recipes/engine_unopt.py
index 7d165ca..befc7e7 100644
--- a/recipes/engine_unopt.py
+++ b/recipes/engine_unopt.py
@@ -63,7 +63,7 @@
 
 def AnalyzeDartUI(api):
   RunGN(api, '--unoptimized')
-  Build(api, 'host_debug_unopt', 'generate_dart_ui')
+  Build(api, 'host_debug_unopt', 'generate_dart_ui', 'sky_engine', 'sky_services')
 
   checkout = GetCheckoutPath(api)
   with api.context(cwd=checkout):