diff options
Diffstat (limited to 'data/buildscripts')
| -rw-r--r-- | data/buildscripts/build-android.sh | 2 | ||||
| -rw-r--r-- | data/buildscripts/mozconfig-android | 8 | ||||
| -rw-r--r-- | data/buildscripts/toolchain-android.sh | 12 |
3 files changed, 12 insertions, 10 deletions
diff --git a/data/buildscripts/build-android.sh b/data/buildscripts/build-android.sh index b47260b..9674e65 100644 --- a/data/buildscripts/build-android.sh +++ b/data/buildscripts/build-android.sh @@ -6,7 +6,7 @@ apt-get -q -y --force-yes build-dep firefox export PATH=$PATH:$PWD/android-sdk-linux/tools:$PWD/android-sdk-linux/build-tools:$PWD/android-sdk-linux/platform-tools:/usr/local/bin -pushd ./python/compare-locales/ +pushd ./l10n/compare-locales/ python setup.py build python setup.py install install -m 755 scripts/* /usr/local/bin diff --git a/data/buildscripts/mozconfig-android b/data/buildscripts/mozconfig-android index 3b21e0e..749c0aa 100644 --- a/data/buildscripts/mozconfig-android +++ b/data/buildscripts/mozconfig-android @@ -1,15 +1,14 @@ 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 --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 @@ -24,6 +23,5 @@ 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-22/ +ac_add_options --with-android-sdk=$PWD/../../toolchains/android-build/android-sdk-linux ac_add_options --with-android-ndk=$PWD/../../toolchains/android-build/android-ndk-r10e - 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 |