From ab4b723c8a74a44e31afb91f087cf9f8e8e125c6 Mon Sep 17 00:00:00 2001 From: Craig Russell Date: Tue, 21 Apr 2020 15:18:45 +0100 Subject: [PATCH 1/2] Ensure NDK version installed --- install_tools.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install_tools.sh b/install_tools.sh index 8f7c96907682..38daba68e016 100755 --- a/install_tools.sh +++ b/install_tools.sh @@ -1,6 +1,7 @@ mkdir "$ANDROID_HOME/licenses" || true; echo "8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"; echo "d56f5187479451eabf01fb78af6dfcb131a6481e" > "$ANDROID_HOME/licenses/android-sdk-license"; +sdkmanager 'ndk;21.0.6113669' sdkmanager tools; yes | sdkmanager --licenses; echo "Fetching ndk-bundle. Suppressing output to avoid travis 4MG size limit"; From 274ad41ba6124b44a6585c99d3bf10edde60cabc Mon Sep 17 00:00:00 2001 From: Craig Russell Date: Tue, 21 Apr 2020 15:23:15 +0100 Subject: [PATCH 2/2] Update license agreements --- install_tools.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/install_tools.sh b/install_tools.sh index 38daba68e016..0b3e406c2b00 100755 --- a/install_tools.sh +++ b/install_tools.sh @@ -1,6 +1,8 @@ mkdir "$ANDROID_HOME/licenses" || true; echo "8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"; echo "d56f5187479451eabf01fb78af6dfcb131a6481e" > "$ANDROID_HOME/licenses/android-sdk-license"; +echo "d56f5187479451eabf01fb78af6dfcb131a6481e" > "$ANDROID_HOME/licenses/android-sdk-license"; +echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > "$ANDROID_HOME/licenses/android-sdk-license"; sdkmanager 'ndk;21.0.6113669' sdkmanager tools; yes | sdkmanager --licenses;