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

android version downgrade for arm and x86 #99

Closed
wants to merge 1 commit into from
Closed

android version downgrade for arm and x86 #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion master/master.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions slaves/android/install-ndk.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down