Finished v38 initial rebase

1 files changed, 9 insertions, 5 deletions

diff --git a/data/buildscripts/toolchain-android.sh b/data/buildscripts/toolchain-android.sh
index 3583af8..aca5957 100644
--- a/data/buildscripts/toolchain-android.sh
+++ b/data/buildscripts/toolchain-android.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 #https://wiki.mozilla.org/Mobile/Fennec/Android/Detailed_build_instructions#Linux
 set -e
+set -x
 
 apt-get -q -y --force-yes install openjdk-7-jdk ant mercurial ccache
 apt-get -q -y --force-yes build-dep firefox
@@ -10,11 +11,14 @@ rm -rf $WD
 mkdir $WD
 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 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/android-sdk_r24.0.2-linux.tgz
-tar -xzf android-sdk_r24.0.2-linux.tgz
+wget http://dl.google.com/android/android-sdk_r24.3.3-linux.tgz
+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
@@ -24,6 +28,6 @@ export PATH=$PATH:$PWD/android-sdk-linux/tools:$PWD/android-sdk-linux/build-tool
 
 ln -s $PWD/android-sdk-linux/build_tools $PWD/android-sdk-linux/build-tools
 
-pkill adb
+pkill adb || true
 
 echo DONE