commit 14be2d1fcb097b45f50d14085a032f1d34d62a7b
author Bill Rassieur <rassb@google.com> Wed Apr 03 17:18:35 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Apr 03 17:18:35 2019 -0700
tree 449c38b6595ef84be9d061b63ab59d0e34313a85
parent 3db6e0c49cb6c5ed8be825fc1b4d89166dd6409e
parent 1272c58d97a55adf57c92b098731c8aa1f3c41ed

Merge master@5428150 into git_qt-dev-plus-aosp.
am: 1272c58d97

Change-Id: Ia5e8a0f80e90046ec5f23d1872f7d5f3c3ef1831

abi/bootstrap

diff --git a/abi/bootstrap b/abi/bootstrap
index 30ea3e3..c2f0120 100755
--- a/abi/bootstrap
+++ b/abi/bootstrap
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ABIGAIL_VERSION=1.5
+ABIGAIL_VERSION=1.6
 
 NUM_CORES=$(cat /proc/cpuinfo | grep -c proc)
 BASE_DIR=$(readlink -f $(dirname $0))
@@ -29,8 +29,11 @@
 
 set -x
 
+PACKAGES="libxml2-dev elfutils libdw-dev"
 # Install the dependencies.
-sudo apt-get install libxml2-dev elfutils libdw-dev
+if ! dpkg -s ${PACKAGES} > /dev/null 2>&1 ; then
+    sudo apt-get install ${PACKAGES}
+fi
 
 if [ ! -d "${LIBABIGAIL_SRC}" ]; then
   git clone git://sourceware.org/git/libabigail.git "${LIBABIGAIL_SRC}"