Skip to content

Commit 4321ba1

Browse files
redsun82Copilot
andcommitted
Gate remaining Android integration tests off linux-arm64
Completes the arm64 gating begun in #22327 for the last two Android-driving java integration tests, so all 10 (the 8 already merged + these) are deselected on linux-arm64 while mac-arm64 and x86_64 stay green. android-8-sample: AGP 8.0.0 ships no linux-aarch64 aapt2 (Google's Maven publishes only linux/osx/windows classifiers), so the build fails on linux-arm64 with an x86-64 aapt2 exec'd on aarch64. android-gradle-incompatibility: gated to avoid conflating that same x86_64-only aapt2 build failure on linux-arm64 with the AGP/Gradle-version incompatibility failure this test asserts (otherwise the test would pass for the wrong reason). Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
1 parent c81a7c1 commit 4321ba1

2 files changed

Lines changed: 10 additions & 0 deletions

File tree

  • java/ql/integration-tests/java
    • android-8-sample
    • diagnostics/android-gradle-incompatibility
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1+
import runs_on
2+
3+
14
# Put Java 11 on the path so as to challenge our version selection logic: Java 11 is unsuitable for Android Gradle Plugin 8+,
25
# so it will be necessary to notice Java 17 available in the environment and actively select it.
6+
# This Android Gradle Plugin version ships no linux-aarch64 aapt2, so the build fails on linux-arm64 (macOS arm64 works).
7+
@(runs_on.x86_64 or runs_on.macos)
38
def test(codeql, use_java_11, java, gradle_8_0, android_sdk):
49
codeql.database.create()
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1+
import runs_on
2+
3+
4+
# Deselected on linux-arm64: the build also fails there due to the x86_64-only aapt2 gap, which would conflate with the AGP/Gradle-incompatibility failure this test asserts.
5+
@(runs_on.x86_64 or runs_on.macos)
16
def test(codeql, java, gradle_7_3, android_sdk):
27
codeql.database.create(_assert_failure=True)

0 commit comments

Comments
 (0)