Try using default NDK and NDK env vars instead of 16

Author: anonymous-akorn

.github/workflows/cpp-packaging.yml

@@ -539,24 +539,11 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: '3.7'
-    # Note: this is needed only to install the NDK.
-    - name: Install SDK Android prerequisites
-      if: matrix.target_platform == 'Android'
-      shell: bash
-      run: |
-        build_scripts/android/install_prereqs.sh
     - name: Prepare for integration tests
       run: |
         pip install -r scripts/gha/requirements.txt
         python scripts/gha/restore_secrets.py --passphrase "${{ secrets.TEST_SECRET }}"
     - name: Build integration tests (and run Desktop tests)
-      # The set up script for Android will download the NDK here.
-      # Need to export from bash, so that /tmp gets converted on Windows.
-      env:
-          NDK_ROOT: /tmp/android-ndk-r16b
-          ANDROID_NDK_HOME: /tmp/android-ndk-r16b
-          ANDROID_NDK_PATH: /tmp/android-ndk-r16b
-      shell: bash
       run: |
         python scripts/gha/build_testapps.py --t ${{ env.apis }} --p ${{ matrix.target_platform }} --sdk_dir firebase_cpp_sdk --output_directory ${{ github.workspace }} --execute_desktop_testapp --noadd_timestamp
 

.github/workflows/integration_tests.yml

@@ -115,15 +115,7 @@ jobs:
           python scripts/gha/restore_secrets.py --passphrase "${{ secrets.TEST_SECRET }}"
 
       - name: Build integration tests (and run Desktop tests)
-        # The set up script for Android will download the NDK here.
-        # Need to use bash, so that /tmp gets converted on Windows.
-        env:
-          NDK_ROOT: /tmp/android-ndk-r16b
-          ANDROID_NDK_HOME: /tmp/android-ndk-r16b
-          ANDROID_NDK_PATH: /tmp/android-ndk-r16b
-        shell: bash
         run: |
-          export NDK_ROOT=/tmp/android-ndk-r16b
           python scripts/gha/build_testapps.py --t ${{ github.event.inputs.apis }} --p ${{ matrix.target_platform }} --output_directory ${{ github.workspace }} --use_vcpkg --execute_desktop_testapp --noadd_timestamp
 
       # Workaround for https://github.com/GoogleCloudPlatform/github-actions/issues/100