Skip to content

Commit 0623cd0

Browse files
committed
Try working around a build tools error on Windows.
1 parent a2aa622 commit 0623cd0

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

.github/workflows/integration_tests.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -449,6 +449,10 @@ jobs:
449449
timeout_minutes: 10
450450
max_attempts: 3
451451
command: scripts/gha/install_test_workflow_prereqs.sh -p Android
452+
- name: Fix dexer command line on Windows
453+
if: startsWith(matrix.os, 'windows')
454+
shell: bash
455+
run: sed -i~ 's/-Djava\.ext\.dirs="\%frameworkdir\%"//' "${ANDROID_HOME}/build-tools/*/d8.bat"
452456
- name: Fetch prebuilt packaged SDK from previous run
453457
uses: dawidd6/action-download-artifact@v2
454458
if: ${{ github.event.inputs.test_packaged_sdk != '' }}

android_build_files/extract_and_dex.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def defineExtractionTasks(String resourceName, String buildType) {
6262
if (org.gradle.internal.os.OperatingSystem.current().isWindows()) {
6363
dex_path = "${dex_path}.bat"
6464
}
65-
65+
6666
commandLine "${dex_path}",
6767
"$buildDir/classes.jar",
6868
"--output",

0 commit comments

Comments
 (0)