commit 61438ca275c3fc4c06cf332e81ade709f28d42b5
author Cindy Lin <xcl@google.com> Mon Apr 04 17:37:38 2022 +0000
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Apr 13 00:24:00 2022 +0000
tree e7c4c56dcb18231187e6754f9745d7674d0cc7b8
parent 09d0c549a5c1db7908f0282c1b0cd0a35bb53fdf

build_packages.sh: Remove migrated USE flags

Exporting USE flags as environment variables has been migrated to Python
so remove the duplicated logic from this script.

BUG=b:218521368
TEST=CQ

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

build_packages.sh

diff --git a/build_packages.sh b/build_packages.sh
index 9dd4a83..e8dc659 100644
--- a/build_packages.sh
+++ b/build_packages.sh
@@ -38,8 +38,6 @@
   "Use any Chrome prebuilt available, even if the prebuilt doesn't match exactly."
 DEFINE_boolean cleanbuild "${FLAGS_FALSE}" \
   "Perform a clean build; delete sysroot if it exists before building."
-DEFINE_boolean internal "${FLAGS_FALSE}" \
-  "Build the internal version of chrome (set the chrome_internal USE flag)."
 DEFINE_boolean pretend "${FLAGS_FALSE}" \
   "Don't build packages, just display which packages would have been installed."
 
@@ -64,8 +62,6 @@
   "Don't automatically rebuild dependencies."
 DEFINE_boolean withdev "${FLAGS_TRUE}" \
   "Build useful developer friendly utilities."
-DEFINE_boolean withdebug "${FLAGS_TRUE}" \
-  "Build debug versions of Chromium-OS-specific packages."
 DEFINE_boolean withfactory "${FLAGS_TRUE}" \
   "Build factory installer."
 DEFINE_boolean withtest "${FLAGS_TRUE}" \
@@ -120,10 +116,6 @@
   "chromeos-base/chrome-icu"
 )
 
-if [[ "${FLAGS_internal}" -eq "${FLAGS_TRUE}" ]]; then
-  export USE="${USE} chrome_internal"
-fi
-
 BOARD_ROOT="${FLAGS_board_root:-/build/${FLAGS_board}}"
 
 # Skip revdeps when we don't already have a built sysroot.
@@ -178,10 +170,6 @@
   EMERGE_FLAGS+=( --show-output )
 fi
 
-if [[ "${FLAGS_withdebug}" -eq "${FLAGS_FALSE}" ]]; then
-  export USE="${USE} -cros-debug"
-fi
-
 # Figure out which packages we should be building.
 PACKAGES=( "$@" )
 FORCE_LOCAL_BUILD_PKGS=()