Skip to content

Commit

Permalink
Clarify the naming of the Kotlin linux+k8 toolchain
Browse files Browse the repository at this point in the history
(cherry picked from commit d243db6)
  • Loading branch information
nreid260 authored and mai93 committed Aug 27, 2024
1 parent e6b7fbe commit 86ac140
Showing 1 changed file with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,11 @@ public void testAndroidLibrary() throws Exception {
assertThat(graph.getFileDependencies(TESTDATA_ROOT.resolve("android/TestAndroidClass.java")))
.containsExactly(
Label.of(
"//third_party/bazel_rules/rules_kotlin/toolchains/kotlin_jvm:kt_jvm_toolchain_linux_sts_jdk"));
"//third_party/bazel_rules/rules_kotlin/toolchains/kotlin_jvm:kt_jvm_toolchain_impl-linux-k8"));
assertThat(graph.projectDeps())
.containsExactly(
Label.of(
"//third_party/bazel_rules/rules_kotlin/toolchains/kotlin_jvm:kt_jvm_toolchain_linux_sts_jdk"));
"//third_party/bazel_rules/rules_kotlin/toolchains/kotlin_jvm:kt_jvm_toolchain_impl-linux-k8"));
}

@Test
Expand All @@ -215,12 +215,12 @@ public void testProjectAndroidLibrariesWithAidlSource_areProjectDeps() throws Ex
assertThat(graph.projectDeps())
.containsExactly(
Label.of(
"//third_party/bazel_rules/rules_kotlin/toolchains/kotlin_jvm:kt_jvm_toolchain_linux_sts_jdk"),
"//third_party/bazel_rules/rules_kotlin/toolchains/kotlin_jvm:kt_jvm_toolchain_impl-linux-k8"),
Label.of("//" + TESTDATA_ROOT + "/aidl:aidl"));
assertThat(graph.getFileDependencies(TESTDATA_ROOT.resolve("aidl/TestAndroidAidlClass.java")))
.containsExactly(
Label.of(
"//third_party/bazel_rules/rules_kotlin/toolchains/kotlin_jvm:kt_jvm_toolchain_linux_sts_jdk"),
"//third_party/bazel_rules/rules_kotlin/toolchains/kotlin_jvm:kt_jvm_toolchain_impl-linux-k8"),
Label.of("//" + TESTDATA_ROOT + "/aidl:aidl"));
}

Expand Down

0 comments on commit 86ac140

Please sign in to comment.