From e8807446b16ba19e110cc23f6b852054614f7ec8 Mon Sep 17 00:00:00 2001
From: Jiaxiang Chen <jiaxiang@google.com>
Date: Tue, 16 Jul 2024 14:36:07 -0700
Subject: [PATCH] change android native targets for integration test until
 android sdk is fixed

(cherry picked from commit 277c868ab85a66a11e5095eff786a2bc7c43674d)
---
 .../google/devtools/ksp/test/KMPImplementedIT.kt | 16 ++++++++--------
 .../kmp/workload-androidNative/build.gradle.kts  |  4 ++--
 .../test/resources/kmp/workload/build.gradle.kts |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/KMPImplementedIT.kt b/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/KMPImplementedIT.kt
index a4d82f5d7a..04b89693f4 100644
--- a/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/KMPImplementedIT.kt
+++ b/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/KMPImplementedIT.kt
@@ -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"))
@@ -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(
diff --git a/integration-tests/src/test/resources/kmp/workload-androidNative/build.gradle.kts b/integration-tests/src/test/resources/kmp/workload-androidNative/build.gradle.kts
index ebf66a8ea7..8fcf96963d 100644
--- a/integration-tests/src/test/resources/kmp/workload-androidNative/build.gradle.kts
+++ b/integration-tests/src/test/resources/kmp/workload-androidNative/build.gradle.kts
@@ -11,12 +11,12 @@ kotlin {
     }
     androidNativeX64() {
         binaries {
-            executable()
+            sharedLib()
         }
     }
     androidNativeArm64() {
         binaries {
-            executable()
+            sharedLib()
         }
     }
     sourceSets {
diff --git a/integration-tests/src/test/resources/kmp/workload/build.gradle.kts b/integration-tests/src/test/resources/kmp/workload/build.gradle.kts
index 09127e9ef2..3b5b2d1fb4 100644
--- a/integration-tests/src/test/resources/kmp/workload/build.gradle.kts
+++ b/integration-tests/src/test/resources/kmp/workload/build.gradle.kts
@@ -24,12 +24,12 @@ kotlin {
     }
     androidNativeX64() {
         binaries {
-            executable()
+            sharedLib()
         }
     }
     androidNativeArm64() {
         binaries {
-            executable()
+            sharedLib()
         }
     }
     // TODO: Enable after CI's Xcode version catches up.