commit ac67cdf38dfe79e4743f72589cc5a39c95afd806
author Alex Klein <saklein@chromium.org> Thu Apr 16 12:58:34 2020 -0600
committer Commit Bot <commit-bot@chromium.org> Sat Apr 18 15:32:10 2020 +0000
tree 881e7b51a2c081cf116884fc61087988c5ea8b76
parent 1e00293f63858ef91b8884d7a4a6392efc936e2d

build_packages: Skip rebuilding chrome-icu.

chromeos-base/chrome-icu should only be built when chrome is
also being built. Add chrome-icu to the skipped packages for
revdeps and when forcing chrome prebuilts.

BUG=chromium:1069842, b:154290468
TEST=manual, verified chrome-icu not built from source
TEST=cq

Change-Id: I91383f2182b07f07a7bc728357b93f5d4610ad33
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosutils/+/2152931
Tested-by: Alex Klein <saklein@chromium.org>
Commit-Queue: Chris McDonald <cjmcdonald@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

build_packages

diff --git a/build_packages b/build_packages
index baf9e0c..11aad0f 100755
--- a/build_packages
+++ b/build_packages
@@ -192,7 +192,10 @@
 )
 
 if [[ "${FLAGS_use_any_chrome}" -eq "${FLAGS_TRUE}" ]]; then
-  EMERGE_CMD+=( "--force-remote-binary=chromeos-base/chromeos-chrome" )
+  EMERGE_CMD+=(
+    "--force-remote-binary=chromeos-base/chromeos-chrome"
+    "--force-remote-binary=chromeos-base/chrome-icu"
+  )
 fi
 
 EMERGE_CMD+=( ${EXTRA_BOARD_FLAGS} )
@@ -276,7 +279,7 @@
 
   # TODO(anush): Make chrome a fake cros-workon package.
   if [[ -n "${CHROME_ORIGIN}" ]]; then
-    CROS_WORKON_PKGS+=( chromeos-base/chromeos-chrome )
+    CROS_WORKON_PKGS+=( chromeos-base/chromeos-chrome chromeos-base/chrome-icu )
   fi
 fi
 
@@ -320,7 +323,9 @@
     # Remove Chrome as rebuilding it is expensive and almost never makes sense.
     # Ignore grep exit status in case chromeos-chrome is the only package.
     MOD_PKGS=( $(printf '%s\n' "${MOD_PKGS[@]}" | \
-      grep -v 'chromeos-base/chromeos-chrome' || :) )
+      grep -v \
+        -e 'chromeos-base/chrome-icu' \
+        -e 'chromeos-base/chromeos-chrome' || :) )
   fi
 
   FORCE_LOCAL_BUILD_PKGS+=( "${MOD_PKGS[@]}" )
@@ -339,7 +344,9 @@
       # sense.  Ignore grep exit status in case chromeos-chrome is the only
       # package.
       RMOD_PKGS=( $(printf '%s\n' "${RMOD_PKGS[@]}" | \
-        grep -v 'chromeos-base/chromeos-chrome' || :) )
+        grep -v \
+          -e 'chromeos-base/chrome-icu' \
+          -e 'chromeos-base/chromeos-chrome' || :) )
       info "final reverse dependencies that will be rebuilt: ${RMOD_PKGS[*]}"
       FORCE_LOCAL_BUILD_PKGS+=( "${RMOD_PKGS[@]}" )
     fi