From a4c5908972c114c7c9608e599fe2ea05ec5db501 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Sat, 17 Dec 2016 16:57:26 +0100 Subject: [PATCH] sigrok-cross-android: Default to the prebuilt toolchains. This fixes the last part of bug #701. --- cross-compile/android/sigrok-cross-android | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android index 4e1214f..d024c7f 100755 --- a/cross-compile/android/sigrok-cross-android +++ b/cross-compile/android/sigrok-cross-android @@ -32,10 +32,10 @@ ANDROID_NDK=$ANDROID_PATH/android-ndk-r10e ANDROID_SDK=$ANDROID_PATH/android-sdk-linux # The path where your Android toolchain directory is located. -TOOLCHAIN=$ANDROID_PATH/android-arm-toolchain +# TOOLCHAIN=$ANDROID_PATH/android-arm-toolchain # TOOLCHAIN=$ANDROID_PATH/android-mipsel-toolchain # TOOLCHAIN=$ANDROID_PATH/android-i686-toolchain -# TOOLCHAIN=$ANDROID_NDK/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86 +TOOLCHAIN=$ANDROID_NDK/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86 # TOOLCHAIN=$ANDROID_NDK/toolchains/x86-4.9/prebuilt/linux-x86 # TOOLCHAIN=$ANDROID_NDK/toolchains/mipsel-linux-android-4.9/prebuilt/linux-x86 -- 2.30.2