Skip to content

Commit d12e9dc

Browse files
redsun82Copilot
andcommitted
Java: gate AGP-7.x Android integration tests off linux-arm64
These integration tests build an Android app via the Android Gradle Plugin (AGP), which downloads Google's prebuilt `aapt2` from Maven. The pinned AGP `7.0.0` and `7.3.1` ship no linux-aarch64 `aapt2`, so on linux-arm64 the build fails at AAPT2 daemon startup and database creation aborts. macOS arm64 is unaffected, as it uses its own `aapt2`. This is a third-party tool gap rather than anything specific to the extractor, and bumping AGP is out of scope since each test's expected output is coupled to the exact AGP and Gradle versions. Following the `java-version-too-old` precedent, gate these tests with `@(runs_on.x86_64 or runs_on.macos)` so they deselect on linux-arm64 while continuing to run on x86_64 and macOS arm64. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
1 parent 2f32a70 commit d12e9dc

8 files changed

Lines changed: 40 additions & 0 deletions

File tree

  • java/ql/integration-tests/java
    • android-sample-kotlin-build-script-no-wrapper
    • android-sample-kotlin-build-script
    • android-sample-no-wrapper
    • android-sample-old-style-kotlin-build-script-no-wrapper
    • android-sample-old-style-kotlin-build-script
    • android-sample-old-style-no-wrapper
    • android-sample-old-style
    • android-sample
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+
# This Android Gradle Plugin version ships no linux-aarch64 aapt2, so the build fails on linux-arm64 (macOS arm64 works).
5+
@(runs_on.x86_64 or runs_on.macos)
16
def test(codeql, use_java_17, java, android_sdk):
27
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+
# This Android Gradle Plugin version ships no linux-aarch64 aapt2, so the build fails on linux-arm64 (macOS arm64 works).
5+
@(runs_on.x86_64 or runs_on.macos)
16
def test(codeql, use_java_11, java, gradle_7_4, android_sdk):
27
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+
# This Android Gradle Plugin version ships no linux-aarch64 aapt2, so the build fails on linux-arm64 (macOS arm64 works).
5+
@(runs_on.x86_64 or runs_on.macos)
16
def test(codeql, use_java_17, java, android_sdk):
27
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+
# This Android Gradle Plugin version ships no linux-aarch64 aapt2, so the build fails on linux-arm64 (macOS arm64 works).
5+
@(runs_on.x86_64 or runs_on.macos)
16
def test(codeql, use_java_17, java, android_sdk, actions_toolchains_file):
27
codeql.database.create(_env={"LGTM_INDEX_MAVEN_TOOLCHAINS_FILE": str(actions_toolchains_file)})
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+
# This Android Gradle Plugin version ships no linux-aarch64 aapt2, so the build fails on linux-arm64 (macOS arm64 works).
5+
@(runs_on.x86_64 or runs_on.macos)
16
def test(codeql, use_java_11, java, gradle_7_4, android_sdk):
27
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+
# This Android Gradle Plugin version ships no linux-aarch64 aapt2, so the build fails on linux-arm64 (macOS arm64 works).
5+
@(runs_on.x86_64 or runs_on.macos)
16
def test(codeql, use_java_17, java, android_sdk, actions_toolchains_file):
27
codeql.database.create(_env={"LGTM_INDEX_MAVEN_TOOLCHAINS_FILE": str(actions_toolchains_file)})
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+
# This Android Gradle Plugin version ships no linux-aarch64 aapt2, so the build fails on linux-arm64 (macOS arm64 works).
5+
@(runs_on.x86_64 or runs_on.macos)
16
def test(codeql, use_java_11, java, gradle_7_4, android_sdk):
27
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+
# This Android Gradle Plugin version ships no linux-aarch64 aapt2, so the build fails on linux-arm64 (macOS arm64 works).
5+
@(runs_on.x86_64 or runs_on.macos)
16
def test(codeql, use_java_11, java, gradle_7_4, android_sdk):
27
codeql.database.create()

0 commit comments

Comments
 (0)