commit 2c8736f14d53b13d79a0c42f5f31ba506e11c0cf
author Cindy Lin <xcl@google.com> Tue Apr 26 04:34:59 2022 +0000
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Apr 29 05:57:53 2022 +0000
tree 7a4bed7038e63dbdaf6d4e25470a18b2f31a3f43
parent bbda8db4cd0011df1bcbd669553285c9dc3bbdde

build_packages.sh: Remove logic for getting pkgs

The base set of packages will be passed as args from Python so remove
the duplicate logic that builds the list of packages from this script.

BUG=b:218521900
TEST=CQ

Cq-Depend: chromium:3607176
Change-Id: I62d60c017a18b2eed1da6c542acc755a400e36b6
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosutils/+/3607452
Reviewed-by: Ram Chandrasekar <rchandrasekar@google.com>
Commit-Queue: Cindy Lin <xcl@google.com>
Tested-by: Cindy Lin <xcl@google.com>

build_packages.sh

diff --git a/build_packages.sh b/build_packages.sh
index 29f6e52..35ab569 100644
--- a/build_packages.sh
+++ b/build_packages.sh
@@ -26,8 +26,6 @@
   "Only use binary packages to bootstrap; abort if any are missing."
 DEFINE_boolean workon "${FLAGS_TRUE}" \
   "Force-build workon packages."
-DEFINE_boolean withautotest "${FLAGS_TRUE}" \
-  "Build autotest client code."
 DEFINE_boolean withrevdeps "${FLAGS_TRUE}" \
   "Calculate reverse dependencies on changed ebuilds."
 DEFINE_boolean use_any_chrome "${FLAGS_TRUE}" \
@@ -54,12 +52,6 @@
   "How many packages to build in parallel at maximum."
 DEFINE_boolean norebuild "${FLAGS_FALSE}" \
   "Don't automatically rebuild dependencies."
-DEFINE_boolean withdev "${FLAGS_TRUE}" \
-  "Build useful developer friendly utilities."
-DEFINE_boolean withfactory "${FLAGS_TRUE}" \
-  "Build factory installer."
-DEFINE_boolean withtest "${FLAGS_TRUE}" \
-  "Build packages required for testing."
 
 # The --reuse_pkgs_from_local_boards flag tells Portage to share binary
 # packages between boards that are built locally, so that the total time
@@ -164,25 +156,13 @@
 # Figure out which packages we should be building.
 PACKAGES=( "$@" )
 FORCE_LOCAL_BUILD_PKGS=()
-if [[ $# -eq 0 ]]; then
-  PACKAGES=( virtual/target-os )
-  if [[ "${FLAGS_withdev}" -eq "${FLAGS_TRUE}" ]]; then
-    PACKAGES+=( virtual/target-os-dev )
-  fi
-  if [[ "${FLAGS_withfactory}" -eq "${FLAGS_TRUE}" ]]; then
-    PACKAGES+=( virtual/target-os-factory )
-    PACKAGES+=( virtual/target-os-factory-shim )
-  fi
-  if [[ "${FLAGS_withtest}" -eq "${FLAGS_TRUE}" ]]; then
-    PACKAGES+=( virtual/target-os-test )
-    # chromeos-ssh-testkeys may generate ssh keys if the right USE flag is set.
-    # We force rebuilding this package from source every time, so that
-    # consecutive builds don't share ssh keys.
-    FORCE_LOCAL_BUILD_PKGS+=( chromeos-base/chromeos-ssh-testkeys )
-  fi
-  if [[ "${FLAGS_withautotest}" -eq "${FLAGS_TRUE}" ]]; then
-    PACKAGES+=( chromeos-base/autotest-all )
-  fi
+TEST_PACKAGES=( $(printf '%s\n' "${PACKAGES[@]}" | \
+  grep "virtual/target-os-test" || :) )
+if [[ ${#TEST_PACKAGES[@]} -gt 0 ]]; then
+  # chromeos-ssh-testkeys may generate ssh keys if the right USE flag is set.
+  # We force rebuilding this package from source every time, so that
+  # consecutive builds don't share ssh keys.
+  FORCE_LOCAL_BUILD_PKGS+=( chromeos-base/chromeos-ssh-testkeys )
 fi
 
 # Build cros_workon packages when they are changed.