From a69b68deb7c163663f2c68307bbe001b65cd178c Mon Sep 17 00:00:00 2001 From: David James Date: Fri, 10 Feb 2012 16:41:50 -0800 Subject: [PATCH] Remove aura special case in setup_board. Now that aura is default, we don't need to special-case it anymore. BUG=chromium-os:25818 TEST=Verify that default prebuilts uploaded by the x86-generic builder are used now instead of the aura-specific prebuilts. These prebuilts have aura enabled now, since it is the default. Change-Id: I8b78f53f5ceab6e5907390e03554120f20ea96fe Reviewed-on: https://gerrit.chromium.org/gerrit/15726 Tested-by: Ryan Cui Reviewed-by: Ryan Cui Commit-Ready: David James Tested-by: David James --- setup_board | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/setup_board b/setup_board index 1e500f4e8f..080dcc81fa 100755 --- a/setup_board +++ b/setup_board @@ -357,11 +357,7 @@ print_board_binhost_config() { preflight_binhost="$binhost_dir/x86-generic-PREFLIGHT_BINHOST.conf" fi if [[ $ARCH = x86 && ! -f "$chrome_binhost" ]]; then - if portageq-$BOARD_VARIANT envvar USE | grep -Eq '(^| )aura( |$)'; then - chrome_binhost="$binhost_dir/x86-generic_aura-$chrome_binhost_suffix" - else - chrome_binhost="$binhost_dir/x86-generic-$chrome_binhost_suffix" - fi + chrome_binhost="$binhost_dir/x86-generic-$chrome_binhost_suffix" fi local partner_overlay="$SRC_ROOT/private-overlays/chromeos-partner-overlay" local internal_binhost_dir="$partner_overlay/chromeos/binhost/target"