Define android.packager console entries at the builders.

Change-Id: Ic75e3fb353430dd6d7028cb71a86f239ec0b516b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2582831
Commit-Queue: Garrett Beaty <gbeaty@chromium.org>
Auto-Submit: Garrett Beaty <gbeaty@chromium.org>
Reviewed-by: Peter Kotwicz <pkotwicz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#835703}

infra/config/generated/luci-milo.cfg

@@ -1985,6 +1985,10 @@ consoles {
   repo_url: "https://chromium.googlesource.com/chromium/src"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-androidx-packager"
+    short_name: "androidx"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/android-avd-packager"
     short_name: "avd"
@@ -1993,10 +1997,6 @@ consoles {
     name: "buildbucket/luci.chromium.ci/android-sdk-packager"
     short_name: "sdk"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/android-androidx-packager"
-    short_name: "androidx"
-  }
   header {
     oncalls {
       name: "Chromium"

infra/config/subprojects/chromium/ci.star

@@ -87,6 +87,10 @@ luci.gitiles_poller(
     ("mirrors", "{} CQ Mirrors Console".format(settings.project_title)),
 )]
 
+ci.console_view(
+    name = "android.packager",
+)
+
 ci.console_view(
     name = "chromium",
     branch_selector = branches.STANDARD_MILESTONE,
@@ -405,6 +409,10 @@ ci.console_view(
 
 ci.builder(
     name = "android-androidx-packager",
+    console_view = "android.packager",
+    console_view_entry = ci.console_view_entry(
+        short_name = "androidx",
+    ),
     executable = "recipe:android/androidx_packager",
     schedule = "0 7,14,22 * * * *",
     service_account = "chromium-cipd-builder@chops-service-accounts.iam.gserviceaccount.com",
@@ -413,6 +421,10 @@ ci.builder(
 
 ci.builder(
     name = "android-avd-packager",
+    console_view = "android.packager",
+    console_view_entry = ci.console_view_entry(
+        short_name = "avd",
+    ),
     executable = "recipe:android/avd_packager",
     properties = {
         "avd_configs": [
@@ -432,6 +444,10 @@ ci.builder(
 
 ci.builder(
     name = "android-sdk-packager",
+    console_view = "android.packager",
+    console_view_entry = ci.console_view_entry(
+        short_name = "sdk",
+    ),
     executable = "recipe:android/sdk_packager",
     schedule = "0 7 * * 0 *",
     service_account = "chromium-cipd-builder@chops-service-accounts.iam.gserviceaccount.com",

infra/config/subprojects/chromium/consoles/android.packager.star

-# Copyright 2020 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-load("//console-header.star", "HEADER")
-
-luci.console_view(
-    name = "android.packager",
-    header = HEADER,
-    repo = "https://chromium.googlesource.com/chromium/src",
-    entries = [
-        luci.console_view_entry(
-            builder = "ci/android-avd-packager",
-            short_name = "avd",
-        ),
-        luci.console_view_entry(
-            builder = "ci/android-sdk-packager",
-            short_name = "sdk",
-        ),
-        luci.console_view_entry(
-            builder = "ci/android-androidx-packager",
-            short_name = "androidx",
-        ),
-    ],
-)

infra/config/subprojects/chromium/subproject.star

@@ -31,7 +31,6 @@ exec("./swangle.try.star")
 #     source = "chromium-m86:try",
 # )
 
-branches.exec("./consoles/android.packager.star")
 branches.exec("./consoles/sheriff.ios.star")
 
 branches.exec("./fallback-cq.star")