Call d8 directly via java instead of by broken shell script.

Author: jonsimantov

.github/workflows/integration_tests.yml

@@ -449,10 +449,6 @@ 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 != '' }}

android_build_files/extract_and_dex.gradle

@@ -58,12 +58,8 @@ def defineExtractionTasks(String resourceName, String buildType) {
       outputs.file "$outPro"
 
       // Convert the jar format using the dx tool.
-      String dex_path = "${sdk_dir}/build-tools/${buildToolsVersion}/d8"
-      if (org.gradle.internal.os.OperatingSystem.current().isWindows()) {
-        dex_path = "${dex_path}.bat"
-      }
-
-      commandLine "${dex_path}",
+      String dex_path = "${sdk_dir}/build-tools/${buildToolsVersion}/lib/d8.jar"
+      commandLine "java", "-cp", "${dex_path}", "com.android.tools.r8.D8",
           "$buildDir/classes.jar",
           "--output",
           "$dexedJar"