From 2ecde3e8312390de751eb78630b6a4b5a0d72d38 Mon Sep 17 00:00:00 2001
From: Sergey Bogolepov <sergey.bogolepov@jetbrains.com>
Date: Tue, 22 Feb 2022 12:20:46 +0300
Subject: [PATCH] [K/N] Enable AndroidProgramType.Standalone by default

^KT-49144 fixed.
---
 .../kotlin/backend/konan/AndroidProgramType.kt   |  2 +-
 .../kotlin/backend/konan/KonanConfig.kt          | 16 ++--------------
 .../org/jetbrains/kotlin/konan/target/Family.kt  |  2 +-
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/AndroidProgramType.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/AndroidProgramType.kt
index 47ca4e67646..f8d72e76ecf 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/AndroidProgramType.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/AndroidProgramType.kt
@@ -26,6 +26,6 @@ enum class AndroidProgramType(
     NativeActivity(null, LinkerOutputKind.DYNAMIC_LIBRARY, true);
 
     companion object {
-        val Default = NativeActivity
+        val Default = Standalone
     }
 }
\ No newline at end of file
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt
index 4af60c21c02..d4f597afe2d 100644
--- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt
+++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt
@@ -304,20 +304,8 @@ class KonanConfig(val project: Project, val configuration: CompilerConfiguration
 
     internal val entryPointName: String by lazy {
         if (target.family == Family.ANDROID) {
-            val androidProgramTypeOrNull = configuration.get(BinaryOptions.androidProgramType)
-            if (androidProgramTypeOrNull == null) {
-                configuration.report(CompilerMessageSeverity.WARNING, """
-                    Android Native executables are currently built as shared libraries with NativeActivity support, but the default behavior is going to change in 1.7.0 to build regular executables instead.
-                    To keep using NativeActivity support, add binaryOptions["androidProgramType"] = "nativeActivity" to your androidNative executable configuration block in Gradle script:
-                    binaries {
-                        executable {
-                            binaryOptions["androidProgramType"] = "nativeActivity"
-                        }
-                    }
-                    See https://youtrack.jetbrains.com/issue/KT-49406 for more details.
-                """.trimIndent())
-            }
-            val androidProgramType = androidProgramTypeOrNull ?: AndroidProgramType.Default
+            val androidProgramType = configuration.get(BinaryOptions.androidProgramType)
+                    ?: AndroidProgramType.Default
             if (androidProgramType.konanMainOverride != null) {
                 return@lazy androidProgramType.konanMainOverride
             }
diff --git a/native/utils/src/org/jetbrains/kotlin/konan/target/Family.kt b/native/utils/src/org/jetbrains/kotlin/konan/target/Family.kt
index c283bca5785..075246d6520 100644
--- a/native/utils/src/org/jetbrains/kotlin/konan/target/Family.kt
+++ b/native/utils/src/org/jetbrains/kotlin/konan/target/Family.kt
@@ -18,7 +18,7 @@ enum class Family(
     WATCHOS("kexe", "lib", "dylib", "lib", "a"),
     LINUX("kexe", "lib", "so", "lib", "a"),
     MINGW("exe", "", "dll", "lib", "a"),
-    ANDROID("so", "lib", "so", "lib", "a"),
+    ANDROID("kexe", "lib", "so", "lib", "a"),
     WASM("wasm", "", "wasm", "", "wasm"),
     ZEPHYR("o", "lib", "a", "lib", "a");