Finished v38 initial rebase

4 files changed, 31 insertions, 12 deletions

diff --git a/data/buildscripts/buildall.sh b/data/buildscripts/buildall.sh
index 504a95f..a4bb372 100644
--- a/data/buildscripts/buildall.sh
+++ b/data/buildscripts/buildall.sh
@@ -14,11 +14,17 @@ function buildpackage(){
 cat << EOF > $SRCDIR/run.sh
 set -e
 set -x
+
+export LD_PRELOAD="/usr/lib/libeatmydata/libeatmydata.so"
+
 mkdir -p $HOME/ccache/$1-$3 || true
 export CCACHE_DIR=$HOME/ccache/$1-$3
 mkdir $SRCDIR/../../toolchains || true
 cd $SRCDIR/../../toolchains
 sh ../data/buildscripts/toolchain-${1}.sh
+cd $SRCDIR/python/compare-locales
+python setup.py install
+cp /usr/local/bin/compare* /usr/bin
 cd $SRCDIR
 sh ../../data/buildscripts/build-${1}.sh
 EOF
@@ -30,14 +36,14 @@ env -i TERM=screen eatmydata sudo HOME=/home/ruben BUILDDIST=$2 ARCH=$3 pbuilder
 #buildpackage mac belenos amd64 |tee mac.log 2>&1
 #buildpackage gnulinux belenos i386 |tee gnulinux-i386.log 2>&1
 #mv $SRCDIR/obj-gnulinux $SRCDIR/obj-gnulinux-i386
-buildpackage gnulinux belenos amd64 |tee gnulinux-amd64.log 2>&1
+#buildpackage gnulinux belenos amd64 |tee gnulinux-amd64.log 2>&1
 #mv $SRCDIR/obj-gnulinux $SRCDIR/obj-gnulinux-amd64
-#buildpackage android belenos i386 |tee android.log 2>&1
+buildpackage android belenos i386  |tee android.log 2>&1
 
 rm binaries -rf
 mkdir binaries/langpacks -p
 #cp $1/obj-windows/dist/icecat*.zip binaries
 #cp $1/obj-mac/dist/icecat/icecat*.dmg binaries
-cp $1/obj-gnulinux*/dist/icecat*.bz2 binaries
-#cp $1/obj-android/dist/icecat*.apk binaries
+#cp $1/obj-gnulinux*/dist/icecat*.bz2 binaries
+cp $1/obj-android/dist/icecat*.apk binaries
 #cp $1/obj-gnulinux-amd64/dist/linux-x86_64/xpi/* binaries/langpacks
diff --git a/data/buildscripts/mozconfig-android b/data/buildscripts/mozconfig-android
index e1d0b6f..3b21e0e 100644
--- a/data/buildscripts/mozconfig-android
+++ b/data/buildscripts/mozconfig-android
@@ -2,9 +2,18 @@ ac_add_options --enable-application=mobile/android
 ac_add_options --target=arm-linux-androideabi
 mk_add_options MOZ_OBJDIR=./obj-android
 ac_add_options --with-android-version=9
+ac_add_options --with-android-min-sdk=11
 
 ac_add_options --enable-update-channel=gnuzilla
 
+ac_add_options --disable-tests
+ac_add_options --disable-updater
+ac_add_options --disable-eme
+ac_add_options --disable-mochitest
+ac_add_options --disable-crashreporter
+ac_add_options --disable-debug
+
+
 #ac_add_options --enable-elf-hack
 #ac_add_options --enable-stdcxx-compat
 #ac_add_options --with-system-zlib
@@ -15,6 +24,6 @@ mk_add_options 'export MOZ_CHROME_MULTILOCALE=en-US cs da de es-ES fi fr ja ko i
 mk_add_options 'export L10NBASEDIR=$PWD/l10n'
 ac_add_options --with-l10n-base=$PWD/l10n
 
-ac_add_options --with-android-sdk=$PWD/../../toolchains/android-build/android-sdk-linux/platforms/android-16/
-ac_add_options --with-android-ndk=$PWD/../../toolchains/android-build/android-ndk-r8e
+ac_add_options --with-android-sdk=$PWD/../../toolchains/android-build/android-sdk-linux/platforms/android-22/
+ac_add_options --with-android-ndk=$PWD/../../toolchains/android-build/android-ndk-r10e
 
diff --git a/data/buildscripts/mozconfig-common b/data/buildscripts/mozconfig-common
index 0de372d..6b49a6f 100644
--- a/data/buildscripts/mozconfig-common
+++ b/data/buildscripts/mozconfig-common
@@ -5,7 +5,7 @@ mk_add_options MOZ_MAKE_FLAGS=-j7
 ac_add_options --with-ccache=/usr/bin/ccache
 
 ac_add_options --disable-debug
-ac_add_options --disable-optimize
+#ac_add_options --disable-optimize
 ac_add_options --disable-tests
 ac_add_options --disable-updater
 ac_add_options --disable-crashreporter
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