From 7937124945e2c1df05dc36485de268856749f266 Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Fri, 22 Apr 2016 10:51:01 -0400 Subject: [PATCH] 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. --- master/master.cfg | 2 +- slaves/android/install-ndk.sh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/master/master.cfg b/master/master.cfg index 44b3d49..a7ed727 100644 --- a/master/master.cfg +++ b/master/master.cfg @@ -864,7 +864,7 @@ class ConfigCommand(object): # Set up the path to the android NDK if testing_android: - s += " --arm-linux-androideabi-ndk=/android/ndk-arm-18" + s += " --arm-linux-androideabi-ndk=/android/ndk-arm-9" s += " --i686-linux-android-ndk=/android/ndk-x86" s += " --aarch64-linux-android-ndk=/android/ndk-aarch64" s += " --disable-docs" diff --git a/slaves/android/install-ndk.sh b/slaves/android/install-ndk.sh index e78f351..ac0ebeb 100755 --- a/slaves/android/install-ndk.sh +++ b/slaves/android/install-ndk.sh @@ -13,6 +13,9 @@ bash android-ndk-r11c/build/tools/make-standalone-toolchain.sh \ --install-dir=/android/ndk-arm-9 \ --ndk-dir=/android/android-ndk-r11c \ --arch=arm +# NB: this arm toolchain is used for testing the libc crate to ensure it +# works against the most recent version of android. It cannot be combined +# with the previous toolchain! bash android-ndk-r11c/build/tools/make-standalone-toolchain.sh \ --platform=android-21 \ --toolchain=arm-linux-androideabi-4.9 \