Merge pull request #22334 from github/redsun82-android-8-sample-arm-gating

Gate remaining Android integration tests off linux-arm64

Author: redsun82

java/ql/integration-tests/java/android-8-sample/test.py

@@ -1,4 +1,9 @@
+import runs_on
+
+
 # Put Java 11 on the path so as to challenge our version selection logic: Java 11 is unsuitable for Android Gradle Plugin 8+,
 # so it will be necessary to notice Java 17 available in the environment and actively select it.
+# This Android Gradle Plugin version ships no linux-aarch64 aapt2, so the build fails on linux-arm64 (macOS arm64 works).
+@(runs_on.x86_64 or runs_on.macos)
 def test(codeql, use_java_11, java, gradle_8_0, android_sdk):
     codeql.database.create()

java/ql/integration-tests/java/diagnostics/android-gradle-incompatibility/test.py

@@ -1,2 +1,7 @@
+import runs_on
+
+
+# Deselected on linux-arm64: there the AGP build fails because no linux-aarch64 aapt2 exists, which is unrelated to the AGP/Gradle version incompatibility this test asserts and would otherwise let it pass for the wrong reason.
+@(runs_on.x86_64 or runs_on.macos)
 def test(codeql, java, gradle_7_3, android_sdk):
     codeql.database.create(_assert_failure=True)