From 8d879fdd775d350896ea0d3f16eb6204df8834b1 Mon Sep 17 00:00:00 2001 From: Pascal Hartig Date: Thu, 26 Nov 2020 05:14:01 -0800 Subject: [PATCH] Install more NDKs (#1715) Summary: I honestly don't know how the resolution works but it seems that we need more than just one NDK. Pull Request resolved: https://github.com/facebook/flipper/pull/1715 Test Plan: Let's hope this turns green. Reviewed By: mweststrate Differential Revision: D25170962 Pulled By: passy fbshipit-source-id: dcdf25b5c77f08bdeceef50d924727cb0c9dcca9 --- .github/workflows/android-sample.yml | 2 +- .github/workflows/android.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android-sample.yml b/.github/workflows/android-sample.yml index ca55e5923..4882dffdc 100644 --- a/.github/workflows/android-sample.yml +++ b/.github/workflows/android-sample.yml @@ -14,7 +14,7 @@ jobs: with: java-version: 1.8 - name: Install NDK 21 - run: echo "y" | sudo /usr/local/lib/android/sdk/tools/bin/sdkmanager --install "ndk;21.0.6113669" --sdk_root=${ANDROID_SDK_ROOT} + run: echo "y" | sudo /usr/local/lib/android/sdk/tools/bin/sdkmanager --install "ndk;21.0.6113669" "ndk;20.0.5594570" --sdk_root=${ANDROID_SDK_ROOT} - name: Build with Gradle run: ./gradlew :sample:assembleDebug :tutorial:assembleDebug - name: upload artifact diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index ec9776399..f5c922aba 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -16,7 +16,7 @@ jobs: with: java-version: 1.8 - name: Install NDK 21 - run: echo "y" | sudo /usr/local/lib/android/sdk/tools/bin/sdkmanager --install "ndk;21.0.6113669" --sdk_root=${ANDROID_SDK_ROOT} + run: echo "y" | sudo /usr/local/lib/android/sdk/tools/bin/sdkmanager --install "ndk;21.0.6113669" "ndk;20.0.5594570" --sdk_root=${ANDROID_SDK_ROOT} - name: Build with Gradle run: ./gradlew :sample:assembleDebug :sample:assembleRelease - name: Rename apk