Commit bcd0c529 authored by Dmytro Golovchenko's avatar Dmytro Golovchenko Committed by Commit Bot

Revert "Add 32-bit version of libappindicator3-1"

This reverts commit 6e3fb99a.

Reason for revert: install-build-deps.sh brocken:

The following packages have unmet dependencies:
 libappindicator3-1 : Conflicts: libappindicator3-1:i386 but 12.10.1+13.10.20130920-0ubuntu4.1 is to be installed
 libappindicator3-1:i386 : Depends: libindicator3-7:i386 (>= 0.4.90) but it is not going to be installed
                           Conflicts: libappindicator3-1 but 12.10.1+13.10.20130920-0ubuntu4.1 is to be installed
E: Unable to correct problems, you have held broken packages.

Original change's description:
> Add 32-bit version of libappindicator3-1
> 
> When doing a 32-bit build on a 64-bit system, the 32-bit version of the
> library is not available. This CL should fix that.
> 
> Bug: 799144
> Change-Id: I40c6d16d708db102eb4da90ded7bc336cb9f9b09
> Reviewed-on: https://chromium-review.googlesource.com/940196
> Reviewed-by: Dirk Pranke <dpranke@chromium.org>
> Commit-Queue: Tim Brown <timbrown@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#539851}

TBR=dpranke@chromium.org,timbrown@chromium.org

Change-Id: Ic6ee1c67eb9c8a5cd438b7f0bc86fbea18125b46
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 799144
Reviewed-on: https://chromium-review.googlesource.com/941614Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
Commit-Queue: Dmytro Golovchenko <dgolovchenko@google.com>
Cr-Commit-Position: refs/heads/master@{#539949}
parent 2cbf4ed1
......@@ -364,9 +364,6 @@ fi
# 32-bit libraries needed e.g. to compile V8 snapshot for Android or armhf
lib32_list="linux-libc-dev:i386 libpci3:i386"
# 32-bit libraries needed for a 32-bit build
lib32_list="$lib32_list libappindicator3-1:i386"
# arm cross toolchain packages needed to build chrome on armhf
EM_REPO="deb http://emdebian.org/tools/debian/ jessie main"
EM_SOURCE=$(cat <<EOF
......@@ -595,9 +592,9 @@ else
fi
if test "$do_inst_lib32" = "1" ; then
echo "Including 32-bit libraries."
echo "Including 32-bit libraries for ARM/Android."
else
echo "Skipping 32-bit libraries."
echo "Skipping 32-bit libraries for ARM/Android."
lib32_list=
fi
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment