From f8067420d63c5952a2aa0201430b22b6916e92dd Mon Sep 17 00:00:00 2001
From: Nick Gerleman <ngerlem@fb.com>
Date: Sat, 24 Dec 2022 23:17:51 -0800
Subject: [PATCH] Windows fixes

---
 .github/actions/setup-android/action.yml | 6 +++---
 .github/actions/setup-js/action.yml      | 8 +++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/actions/setup-android/action.yml b/.github/actions/setup-android/action.yml
index c2666453..ce3d1b23 100644
--- a/.github/actions/setup-android/action.yml
+++ b/.github/actions/setup-android/action.yml
@@ -3,11 +3,11 @@ name: Setup Android envirionment
 runs:
   using: "composite"
   steps:
-    - name: Install JDK 1.8
-      uses: actions/setup-java@v1
+    - name: Select Java Version
+      uses: actions/setup-java@v2
       with:
         java-version: 1.8
 
     - name: Install NDK 21
       shell: bash
-      run: echo "y" | /usr/local/lib/android/sdk/tools/bin/sdkmanager --install "ndk;21.3.6528147" --sdk_root=${ANDROID_SDK_ROOT}
+      run: echo "y" | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "ndk;21.3.6528147"
diff --git a/.github/actions/setup-js/action.yml b/.github/actions/setup-js/action.yml
index 17ce83ed..3694fb17 100644
--- a/.github/actions/setup-js/action.yml
+++ b/.github/actions/setup-js/action.yml
@@ -11,10 +11,16 @@ runs:
     - name: Install emsdk
       uses: ./.github/actions/install-emsdk
 
-    - name: Install ninja
+    - name: Install ninja (Linux)
+      if: ${{ runner.os == 'Linux' }}
       shell: bash
       run: sudo apt-get install -y ninja-build
 
+    - name: Install ninja (Windows)
+      if: ${{ runner.os == 'Windows' }}
+      shell: powershell
+      run: choco install ninja
+
     - name: yarn install
       shell: bash
       run: yarn install --frozen-lockfile