build: Switch to use gradle wrapper
Change-Id: I13ed44edc30badebbe325e2cabd4cbd857f065ad
diff --git a/.jenkins.d/00-deps.sh b/.jenkins.d/00-deps.sh
index c69e3fb..056626b 100755
--- a/.jenkins.d/00-deps.sh
+++ b/.jenkins.d/00-deps.sh
@@ -4,10 +4,7 @@
echo -en 'travis_fold:start:deps\r'
-sudo apt-get install -y build-essential git openjdk-7-jdk unzip p7zip-full
-
-# SDK binaries need i386 libraries
-sudo dpkg --add-architecture i386;
-sudo apt-get update -qq; sudo apt-get install -y libc6:i386 libncurses5:i386 libstdc++6:i386 zlib1g:i386
+sudo apt-get install -y build-essential git openjdk-7-jdk unzip
+sudo apt-get install -y lib32stdc++6 lib32z1 lib32z1-dev
echo -en 'travis_fold:end:deps\r'
diff --git a/.jenkins.d/10-get-sdk.sh b/.jenkins.d/10-get-sdk.sh
index fef1aaa..84d231d 100755
--- a/.jenkins.d/10-get-sdk.sh
+++ b/.jenkins.d/10-get-sdk.sh
@@ -2,7 +2,6 @@
set -e
set -x
-GRADLE_VERSION=2.10
SDK_VERSION=24.4.1
BUILD_TOOLS_VERSION=21.1.2
COMPILE_SDK_VERSION=21
@@ -21,12 +20,4 @@
echo "y" | android update sdk --filter "android-19" --no-ui --all --force
fi
-if [ ! -d gradle-$GRADLE_VERSION ]; then
- wget -nv https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip
- unzip gradle-$GRADLE_VERSION-bin.zip
- rm gradle-$GRADLE_VERSION-bin.zip
-
- ln -s `pwd`/gradle-$GRADLE_VERSION/bin/gradle gradle
-fi
-
echo sdk.dir=`pwd`/$SDK >> local.properties