Skip to content
This repository was archived by the owner on Nov 21, 2018. It is now read-only.

Commit 7937124

Browse files
committed
use API level 9 for arm and x86
This change makes them more compatible with Firefox releases, which currently use API level 9 as their baseline. Fixes #98.
1 parent 72ae9cd commit 7937124

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

master/master.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -864,7 +864,7 @@ class ConfigCommand(object):
864864

865865
# Set up the path to the android NDK
866866
if testing_android:
867-
s += " --arm-linux-androideabi-ndk=/android/ndk-arm-18"
867+
s += " --arm-linux-androideabi-ndk=/android/ndk-arm-9"
868868
s += " --i686-linux-android-ndk=/android/ndk-x86"
869869
s += " --aarch64-linux-android-ndk=/android/ndk-aarch64"
870870
s += " --disable-docs"

slaves/android/install-ndk.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ bash android-ndk-r11c/build/tools/make-standalone-toolchain.sh \
1313
--install-dir=/android/ndk-arm-9 \
1414
--ndk-dir=/android/android-ndk-r11c \
1515
--arch=arm
16+
# NB: this arm toolchain is used for testing the libc crate to ensure it
17+
# works against the most recent version of android. It cannot be combined
18+
# with the previous toolchain!
1619
bash android-ndk-r11c/build/tools/make-standalone-toolchain.sh \
1720
--platform=android-21 \
1821
--toolchain=arm-linux-androideabi-4.9 \

0 commit comments

Comments
 (0)