From 919ea4e8f7ffda28baea5168a15b3424bf521a9d Mon Sep 17 00:00:00 2001
From: Igor Chevdar <igor.chevdar@jetbrains.com>
Date: Tue, 20 Jun 2017 19:07:02 +0300
Subject: [PATCH] Fixed android build

---
 backend.native/konan.properties                    |  4 ++--
 samples/androidNativeActivity/build.gradle         | 14 ++++++++++++--
 samples/androidNativeActivity/gradle.properties    |  1 +
 .../gradle.properties.for_bundle                   |  1 +
 samples/androidNativeActivity/settings.gradle      |  1 +
 5 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 samples/androidNativeActivity/gradle.properties
 create mode 100644 samples/androidNativeActivity/gradle.properties.for_bundle
 create mode 100644 samples/androidNativeActivity/settings.gradle

diff --git a/backend.native/konan.properties b/backend.native/konan.properties
index 83fb3e4323a..9623754c768 100644
--- a/backend.native/konan.properties
+++ b/backend.native/konan.properties
@@ -155,7 +155,7 @@ quadruple.android_arm32 = arm-linux-androideabi
 entrySelector.android_arm32 =  -Wl,--defsym -Wl,main=Konan_main
 llvmLtoFlags.android_arm32 = -exported-symbol=Konan_main -emulated-tls -relocation-model=pic
 llvmLtoOptFlags.android_arm32 = -O3 -function-sections
-linkerDebugFlags.android_arm32 = -S
+linkerDebugFlags.android_arm32 = -Wl,-S
 llvmLtoNooptFlags.android_arm32 = -O1
 targetSysRoot.android_arm32 = target-sysroot-21-android_arm32
 libffiDir.android_arm32 = libffi-3.2.1-2-android_arm32
@@ -182,7 +182,7 @@ llvmLtoFlags.android_arm64 = -exported-symbol=Konan_main -emulated-tls -relocati
 targetSysRoot.android_arm64 = target-sysroot-21-android_arm64
 libffiDir.android_arm64 = libffi-3.2.1-2-android_arm64
 linkerKonanFlags.android_arm64 = -lm -latomic -lstdc++ -landroid
-linkerDebugFlags.android_arm64 = -S
+linkerDebugFlags.android_arm64 = -Wl,-S
 
 # Windows x86-64, based on mingw-w64.
 llvmVersion.mingw = 3.9.1
diff --git a/samples/androidNativeActivity/build.gradle b/samples/androidNativeActivity/build.gradle
index 4e1bd8ef218..d2ab9d65c28 100644
--- a/samples/androidNativeActivity/build.gradle
+++ b/samples/androidNativeActivity/build.gradle
@@ -5,6 +5,16 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle-experimental:0.9.2'
     }
+
+    repositories {
+        mavenCentral()
+        maven {
+            url "https://dl.bintray.com/jetbrains/kotlin-native-dependencies"
+        }
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-native-gradle-plugin:+"
+    }
 }
 
 allprojects {
@@ -96,9 +106,9 @@ model {
 task renameArtifacts << {
     for (artifact in artifacts) {
         copy {
-            from "build/konan/bin/${artifact}"
+            from "build/konan/bin"
             into "build/konan/bin/${artifact}"
-            rename "${artifact}.kexe", "libpoly.so"
+            rename "${artifact}.so", "libpoly.so"
         }
     }
 }
diff --git a/samples/androidNativeActivity/gradle.properties b/samples/androidNativeActivity/gradle.properties
new file mode 100644
index 00000000000..196f4b3055e
--- /dev/null
+++ b/samples/androidNativeActivity/gradle.properties
@@ -0,0 +1 @@
+konan.home=../../dist
diff --git a/samples/androidNativeActivity/gradle.properties.for_bundle b/samples/androidNativeActivity/gradle.properties.for_bundle
new file mode 100644
index 00000000000..5e41860b04f
--- /dev/null
+++ b/samples/androidNativeActivity/gradle.properties.for_bundle
@@ -0,0 +1 @@
+konan.home=../..
diff --git a/samples/androidNativeActivity/settings.gradle b/samples/androidNativeActivity/settings.gradle
new file mode 100644
index 00000000000..af876428f84
--- /dev/null
+++ b/samples/androidNativeActivity/settings.gradle
@@ -0,0 +1 @@
+includeBuild '../../'