Try working around a build tools error on Windows.

firebase · Sep 24, 2024 · 082887d · 082887d
1 parent 3b0942e
commit 082887d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
@@ -449,6 +449,10 @@ jobs:
           timeout_minutes: 10
           max_attempts: 3
           command: scripts/gha/install_test_workflow_prereqs.sh -p Android
+      - name: Fix dexer command line on Windows
+        if: startsWith(matrix.os, 'windows')
+        shell: bash
+        run: sed -i~ 's/-Djava\.ext\.dirs="\%frameworkdir\%"//' "${ANDROID_HOME}/build-tools/*/d8.bat"
       - name: Fetch prebuilt packaged SDK from previous run
         uses: dawidd6/action-download-artifact@v2
         if: ${{ github.event.inputs.test_packaged_sdk != '' }}

diff --git a/android_build_files/extract_and_dex.gradle b/android_build_files/extract_and_dex.gradle
@@ -61,13 +61,8 @@ def defineExtractionTasks(String resourceName, String buildType) {
       String dex_path = "${sdk_dir}/build-tools/${buildToolsVersion}/d8"
       if (org.gradle.internal.os.OperatingSystem.current().isWindows()) {
         dex_path = "${dex_path}.bat"
-
-        commandLine "cmd", "/c", "echo", "${dex_path}",
-            "$buildDir/classes.jar",
-            "--output",
-            "$dexedJar"
       }
-      
+
       commandLine "${dex_path}",
           "$buildDir/classes.jar",
           "--output",