From aeb39be740d309afae2ac5adb2d5e1b8346fdb8a Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Wed, 10 Jan 2018 13:50:23 +0200 Subject: Upgrade Android NDK to r16b and switch to clang We need to upgrade the Android NDK version when we switch to building with clang. Task-number: QTQAINFRA-1681 Change-Id: Ic43b28ead393ec5828b099727182df5f4424f419 Reviewed-by: Liang Qi --- coin/provisioning/common/linux/android_linux.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'coin/provisioning/common/linux') diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 68e77dd1..7bcdbdce 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -51,13 +51,13 @@ basePath="http://ci-files01-hki.intra.qt.io/input/android" toolsVersion="r25.2.5" toolsFile="tools_$toolsVersion-linux.zip" -ndkVersion="r10e" +ndkVersion="r16b" ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip" sdkBuildToolsVersion="25.0.2" sdkApiLevel="android-21" toolsSha1="72df3aa1988c0a9003ccdfd7a13a7b8bd0f47fc1" -ndkSha1="f692681b007071103277f6edc6f91cb5c5494a32" +ndkSha1="42aa43aae89a50d1c66c3f9fdecd676936da6128" toolsTargetFile="/tmp/$toolsFile" toolsSourceFile="$basePath/$toolsFile" -- cgit v1.2.3