Skip to content

Commit

Permalink
change android native targets for integration test until android sdk …
Browse files Browse the repository at this point in the history
…is fixed

(cherry picked from commit 277c868)
  • Loading branch information
neetopia authored and KSP Auto Pick committed Jul 17, 2024
1 parent 9bacece commit e880744
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -175,16 +175,16 @@ class KMPImplementedIT(useKSP2: Boolean) {
).build().let {
Assert.assertEquals(TaskOutcome.SUCCESS, it.task(":workload-androidNative:build")?.outcome)
verifyKexe(
"workload-androidNative/build/bin/androidNativeX64/debugExecutable/workload-androidNative.kexe"
"workload-androidNative/build/bin/androidNativeX64/debugShared/libworkload_androidNative.so"
)
verifyKexe(
"workload-androidNative/build/bin/androidNativeX64/releaseExecutable/workload-androidNative.kexe"
"workload-androidNative/build/bin/androidNativeX64/releaseShared/libworkload_androidNative.so"
)
verifyKexe(
"workload-androidNative/build/bin/androidNativeArm64/debugExecutable/workload-androidNative.kexe"
"workload-androidNative/build/bin/androidNativeArm64/debugShared/libworkload_androidNative.so"
)
verifyKexe(
"workload-androidNative/build/bin/androidNativeArm64/releaseExecutable/workload-androidNative.kexe"
"workload-androidNative/build/bin/androidNativeArm64/releaseShared/libworkload_androidNative.so"
)
Assert.assertFalse(it.output.contains("kotlin scripting plugin:"))
Assert.assertTrue(it.output.contains("w: [ksp] platforms: [Native"))
Expand Down Expand Up @@ -306,10 +306,10 @@ class KMPImplementedIT(useKSP2: Boolean) {

verifyKexe("workload/build/bin/linuxX64/debugExecutable/workload.kexe")
verifyKexe("workload/build/bin/linuxX64/releaseExecutable/workload.kexe")
verifyKexe("workload/build/bin/androidNativeX64/debugExecutable/workload.kexe")
verifyKexe("workload/build/bin/androidNativeX64/releaseExecutable/workload.kexe")
verifyKexe("workload/build/bin/androidNativeArm64/debugExecutable/workload.kexe")
verifyKexe("workload/build/bin/androidNativeArm64/releaseExecutable/workload.kexe")
verifyKexe("workload/build/bin/androidNativeX64/debugShared/libworkload.so")
verifyKexe("workload/build/bin/androidNativeX64/releaseShared/libworkload.so")
verifyKexe("workload/build/bin/androidNativeArm64/debugShared/libworkload.so")
verifyKexe("workload/build/bin/androidNativeArm64/releaseShared/libworkload.so")

// TODO: Enable after CI's Xcode version catches up.
// Assert.assertTrue(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ kotlin {
}
androidNativeX64() {
binaries {
executable()
sharedLib()
}
}
androidNativeArm64() {
binaries {
executable()
sharedLib()
}
}
sourceSets {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ kotlin {
}
androidNativeX64() {
binaries {
executable()
sharedLib()
}
}
androidNativeArm64() {
binaries {
executable()
sharedLib()
}
}
// TODO: Enable after CI's Xcode version catches up.
Expand Down

0 comments on commit e880744

Please sign in to comment.