Skip to content

Commit

Permalink
install-build-deps: Remove redundant dev_list
Browse files Browse the repository at this point in the history
Logic was added to select the right package, based on packages available
within the distro, but the final dev list assignment overwrote what was
selected based on distro.  This results in a breakage for Ubuntu based
builders that still utilize the older package.

Bug: 1122846
Test: './install-build-deps on Ubuntu'
Change-Id: Ia96d29c2b2767bb3a22b002cfba97a9525d246e8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2386659
Commit-Queue: Mike Nichols <mikenichols@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803302}
  • Loading branch information
Mike Nichols authored and Commit Bot committed Aug 31, 2020
1 parent 2f10d73 commit 6063682
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions build/install-build-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,6 @@ if file -L /sbin/init | grep -q 'ELF 64-bit'; then
elif package_exists lib32gcc1; then
dev_list="${dev_list} lib32gcc1"
fi

dev_list="${dev_list} libc6-i386 lib32gcc-s1 lib32stdc++6"
fi

# Run-time libraries required by chromeos only
Expand Down

0 comments on commit 6063682

Please sign in to comment.