[Native] Enable real Android Native executables (#4624)

* Add AndroidProgramType binary option, override entry point, fix linker flags

* Add Konan_main_standalone entry point to the Android runtime

* Add compiler warning

* Make standalone programs print to stdout

* Fix warning message and readability

kotlin-native/runtime/src/launcher/cpp/androidLauncher.cpp

@@ -29,6 +29,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
+#include "launcher.h"
 #include "androidLauncher.h"
 
 #include <android/log.h>
@@ -44,8 +45,6 @@
 #endif
 
 //--- main --------------------------------------------------------------------//
-extern "C" KInt Konan_start(const ObjHeader*);
-
 namespace {
 
 typedef struct {

kotlin-native/runtime/src/launcher/cpp/launcher.cpp

@@ -21,7 +21,7 @@
 #include "Types.h"
 #include "Worker.h"
 
-#ifndef KONAN_ANDROID
+#include "launcher.h"
 
 //--- Setup args --------------------------------------------------------------//
 
@@ -38,8 +38,6 @@ OBJ_GETTER(setupArgs, int argc, const char** argv) {
 }
 
 //--- main --------------------------------------------------------------------//
-extern "C" KInt Konan_start(const ObjHeader*);
-
 extern "C" KInt Konan_run_start(int argc, const char** argv) {
     ObjHolder args;
     setupArgs(argc, argv, args.slot());
@@ -64,7 +62,11 @@ extern "C" RUNTIME_USED int Init_and_run_start(int argc, const char** argv, int
   return exitStatus;
 }
 
+#ifndef KONAN_ANDROID
 extern "C" RUNTIME_USED int Konan_main(int argc, const char** argv) {
+#else
+extern "C" RUNTIME_USED int Konan_main_standalone(int argc, const char** argv) {
+#endif
     return Init_and_run_start(argc, argv, 1);
 }
 
@@ -83,6 +85,4 @@ extern "C" RUNTIME_USED int Konan_js_main(int argc, int memoryDeInit) {
     return Init_and_run_start(argc, (const char**)argv, memoryDeInit);
 }
 
-#endif 
-
 #endif

kotlin-native/runtime/src/launcher/cpp/launcher.h

@@ -0,0 +1,30 @@
+/*
+  * Copyright 2010-2021 JetBrains s.r.o.
+  *
+  * Licensed under the Apache License, Version 2.0 (the "License");
+  * you may not use this file except in compliance with the License.
+  * You may obtain a copy of the License at
+  *
+  * http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+
+#ifndef LAUNCHER_H
+#define LAUNCHER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+KInt Konan_start(const ObjHeader*);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // LAUNCHER_H

kotlin-native/runtime/src/main/cpp/CompilerConstants.cpp

@@ -16,6 +16,9 @@ RUNTIME_WEAK int32_t Kotlin_gcAggressive = 0;
 RUNTIME_WEAK int32_t Kotlin_workerExceptionHandling = 0;
 RUNTIME_WEAK int32_t Kotlin_freezingEnabled = 1;
 RUNTIME_WEAK const Kotlin_getSourceInfo_FunctionType Kotlin_getSourceInfo_Function = nullptr;
+#ifdef KONAN_ANDROID
+RUNTIME_WEAK int32_t Kotlin_printToAndroidLogcat = 1;
+#endif
 
 ALWAYS_INLINE compiler::DestroyRuntimeMode compiler::destroyRuntimeMode() noexcept {
     return static_cast<compiler::DestroyRuntimeMode>(Kotlin_destroyRuntimeMode);
@@ -32,3 +35,9 @@ ALWAYS_INLINE compiler::WorkerExceptionHandling compiler::workerExceptionHandlin
 ALWAYS_INLINE bool compiler::freezingEnabled() noexcept {
     return Kotlin_freezingEnabled != 0;
 }
+
+#ifdef KONAN_ANDROID
+ALWAYS_INLINE bool compiler::printToAndroidLogcat() noexcept {
+    return Kotlin_printToAndroidLogcat != 0;
+}
+#endif

kotlin-native/runtime/src/main/cpp/CompilerConstants.hpp

@@ -82,6 +82,10 @@ ALWAYS_INLINE inline int getSourceInfo(void* addr, SourceInfo *result, int resul
     }
 }
 
+#ifdef KONAN_ANDROID
+bool printToAndroidLogcat() noexcept;
+#endif
+
 } // namespace compiler
 } // namespace kotlin
 

kotlin-native/runtime/src/main/cpp/Console.cpp

@@ -22,6 +22,9 @@
 #include "Porting.h"
 #include "Types.h"
 #include "Exceptions.h"
+#ifdef KONAN_ANDROID
+#include "CompilerConstants.hpp"
+#endif
 
 #include "utf8.h"
 
@@ -46,8 +49,12 @@ void Kotlin_io_Console_print(KString message) {
 void Kotlin_io_Console_println(KString message) {
     Kotlin_io_Console_print(message);
 #ifndef KONAN_ANDROID
-    // On Android single print produces logcat entry, so no need in linefeed.
     Kotlin_io_Console_println0();
+#else
+    // On Android single print produces logcat entry, so no need in linefeed.
+    if (!kotlin::compiler::printToAndroidLogcat()) {
+        Kotlin_io_Console_println0();
+    }
 #endif
 }
 

kotlin-native/runtime/src/main/cpp/Porting.cpp

@@ -62,8 +62,12 @@ void consoleInit() {
 
 void consoleWriteUtf8(const char* utf8, uint32_t sizeBytes) {
 #ifdef KONAN_ANDROID
-  // TODO: use sizeBytes!
-  __android_log_print(ANDROID_LOG_INFO, "Konan_main", "%s", utf8);
+  if (kotlin::compiler::printToAndroidLogcat()) {
+    // TODO: use sizeBytes!
+    __android_log_print(ANDROID_LOG_INFO, "Konan_main", "%s", utf8);
+  } else {
+    ::write(STDOUT_FILENO, utf8, sizeBytes);
+  }
 #else
   ::write(STDOUT_FILENO, utf8, sizeBytes);
 #endif
@@ -71,8 +75,12 @@ void consoleWriteUtf8(const char* utf8, uint32_t sizeBytes) {
 
 NO_EXTERNAL_CALLS_CHECK void consoleErrorUtf8(const char* utf8, uint32_t sizeBytes) {
 #ifdef KONAN_ANDROID
-  // TODO: use sizeBytes!
-  __android_log_print(ANDROID_LOG_ERROR, "Konan_main", "%s", utf8);
+  if (kotlin::compiler::printToAndroidLogcat()) {
+    // TODO: use sizeBytes!
+    __android_log_print(ANDROID_LOG_ERROR, "Konan_main", "%s", utf8);
+  } else {
+    ::write(STDERR_FILENO, utf8, sizeBytes);
+  }
 #else
   ::write(STDERR_FILENO, utf8, sizeBytes);
 #endif