summaryrefslogtreecommitdiff
path: root/data/buildscripts/toolchain-android.sh
diff options
context:
space:
mode:
Diffstat (limited to 'data/buildscripts/toolchain-android.sh')
-rw-r--r--data/buildscripts/toolchain-android.sh12
1 files changed, 8 insertions, 4 deletions
diff --git a/data/buildscripts/toolchain-android.sh b/data/buildscripts/toolchain-android.sh
index 59a3456..b95350a 100644
--- a/data/buildscripts/toolchain-android.sh
+++ b/data/buildscripts/toolchain-android.sh
@@ -3,7 +3,7 @@
set -e
set -x
-apt-get -q -y --force-yes install openjdk-7-jdk ant mercurial ccache
+apt-get -q -y --force-yes install openjdk-7-jdk ant mercurial ccache lib32stdc++6 lib32z1
apt-get -q -y --force-yes build-dep firefox
WD=android-build
@@ -13,9 +13,9 @@ cd $WD
#wget https://dl.google.com/android/ndk/android-ndk-r8e-linux-x86.tar.bz2
#tar -xjf android-ndk-r8e-linux-x86.tar.bz2
-wget http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86.bin
-chmod 755 android-ndk-r10e-linux-x86.bin
-./android-ndk-r10e-linux-x86.bin
+wget http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin
+chmod 755 android-ndk-r10e-linux-x86_64.bin
+./android-ndk-r10e-linux-x86_64.bin
wget http://dl.google.com/android/android-sdk_r24.3.3-linux.tgz
tar -xzf android-sdk_r24.3.3-linux.tgz
@@ -23,6 +23,10 @@ tar -xzf android-sdk_r24.3.3-linux.tgz
while true; do echo y; sleep 1; done |./android-sdk-linux/tools/android update sdk -u
#while true; do echo y; sleep 1; done |./android-sdk-linux/tools/android update adb
+wget https://dl.google.com/android/repository/build-tools_r23.0.3-linux.zip
+unzip build-tools_r23.0.3-linux.zip
+mv android-6.0 android-sdk-linux/build-tools/23.0.3
+
echo export PATH=$PATH:$PWD/android-sdk-linux/tools:$PWD/android-sdk-linux/build-tools:$PWD/android-sdk-linux/platform-tools
export PATH=$PATH:$PWD/android-sdk-linux/tools:$PWD/android-sdk-linux/build-tools:$PWD/android-sdk-linux/platform-tools