From 082887dd4f8ce09be8e45fba51ae841f5d930dd2 Mon Sep 17 00:00:00 2001
From: Jon Simantov <jsimantov@google.com>
Date: Tue, 24 Sep 2024 15:20:39 -0700
Subject: [PATCH] Try working around a build tools error on Windows.

---
 .github/workflows/integration_tests.yml    | 4 ++++
 android_build_files/extract_and_dex.gradle | 7 +------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index b94a5d0c75..daf6b3a26d 100644
--- 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
index 890c6fb1df..aa5123f050 100644
--- 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",