Revert "Ubuntu18 (#200)" (#201)

This reverts commit 28e1832.

Author: dnfield

build/install-build-deps-android.sh

@@ -1,29 +1,102 @@
-#!/bin/bash
+#!/bin/bash -e
+
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
+
 # Script to install everything needed to build chromium on android, including
 # items requiring sudo privileges.
-# See https://www.chromium.org/developers/how-tos/android-build-instructions
+# See http://code.google.com/p/chromium/wiki/AndroidBuildInstructions
+
 args="$@"
+if test "$1" = "--skip-sdk-packages"; then
+  skip_inst_sdk_packages=1
+  args="${@:2}"
+else
+  skip_inst_sdk_packages=0
+fi
+
 if ! uname -m | egrep -q "i686|x86_64"; then
   echo "Only x86 architectures are currently supported" >&2
   exit
 fi
-# Exit if any commands fail.
-set -e
-lsb_release=$(lsb_release --codename --short)
+
 # Install first the default Linux build deps.
 "$(dirname "${BASH_SOURCE[0]}")/install-build-deps.sh" \
-  --no-syms --lib32 --no-arm --no-chromeos-fonts --no-nacl --no-prompt "${args}"
+  --no-syms --lib32 --no-arm --no-prompt "${args}"
+
+lsb_release=$(lsb_release --codename --short)
+
+# The temporary directory used to store output of update-java-alternatives
+TEMPDIR=$(mktemp -d)
+cleanup() {
+  local status=${?}
+  trap - EXIT
+  rm -rf "${TEMPDIR}"
+  exit ${status}
+}
+trap cleanup EXIT
+
 # Fix deps
 sudo apt-get -f install
+
+# Install deps
+# This step differs depending on what Ubuntu release we are running
+# on since the package names are different, and Sun's Java must
+# be installed manually on late-model versions.
+
 # common
-sudo apt-get -y install lib32z1 lighttpd python-pexpect xvfb x11-utils
+sudo apt-get -y install lighttpd python-pexpect xvfb x11-utils
+
 # Some binaries in the Android SDK require 32-bit libraries on the host.
 # See https://developer.android.com/sdk/installing/index.html?pkg=tools
-sudo apt-get -y install libncurses5:i386 libstdc++6:i386 zlib1g:i386
-# Required for apk-patch-size-estimator
-sudo apt-get -y install bsdiff
-sudo apt-get -y install openjdk-8-jre openjdk-8-jdk
-echo "install-build-deps-android.sh complete."
+if [[ $lsb_release == "precise" ]]; then
+  sudo apt-get -y install ia32-libs
+else
+  sudo apt-get -y install libncurses5:i386 libstdc++6:i386 zlib1g:i386
+fi
+
+if [[ $lsb_release == "xenial" || $lsb_release == "rodete" ]]; then
+  sudo apt-get -y install openjdk-8-jre openjdk-8-jdk
+  sudo update-java-alternatives -s java-1.8.0-openjdk-amd64
+  sudo apt-get -y install ant
+else
+  sudo apt-get -y install ant
+
+  # Install openjdk and openjre 7 stuff
+  sudo apt-get -y install openjdk-7-jre openjdk-7-jdk
+
+  # Switch version of Java to openjdk 7.
+  # Some Java plugins (e.g. for firefox, mozilla) are not required to build, and
+  # thus are treated only as warnings. Any errors in updating java alternatives
+  # which are not '*-javaplugin.so' will cause errors and stop the script from
+  # completing successfully.
+  if ! sudo update-java-alternatives -s java-1.7.0-openjdk-amd64 \
+             >& "${TEMPDIR}"/update-java-alternatives.out
+  then
+    # Check that there are the expected javaplugin.so errors for the update
+    if grep 'javaplugin.so' "${TEMPDIR}"/update-java-alternatives.out >& \
+        /dev/null
+    then
+      # Print as warnings all the javaplugin.so errors
+      echo 'WARNING: java has no alternatives for the following plugins:'
+      grep 'javaplugin.so' "${TEMPDIR}"/update-java-alternatives.out
+    fi
+    # Check if there are any errors that are not javaplugin.so
+    if grep -v 'javaplugin.so' "${TEMPDIR}"/update-java-alternatives.out \
+        >& /dev/null
+    then
+      # If there are non-javaplugin.so errors, treat as errors and exit
+      echo 'ERRORS: Failed to update alternatives for java:'
+      grep -v 'javaplugin.so' "${TEMPDIR}"/update-java-alternatives.out
+      exit 1
+    fi
+  fi
+fi
+
+# Install SDK packages for android
+if test "$skip_inst_sdk_packages" != 1; then
+  "$(dirname "${BASH_SOURCE[0]}")/install-android-sdks.sh"
+fi
+
+echo "install-build-deps-android.sh complete."