Fixed android build

2017-06-20 19:07:02 +03:00
parent fb20eb9a37
commit 919ea4e8f7
5 changed files with 17 additions and 4 deletions
@@ -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
@@ -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"
        }
    }
 }
@@ -0,0 +1 @@
+konan.home=../../dist
@@ -0,0 +1 @@
+konan.home=../..
@@ -0,0 +1 @@
+includeBuild '../../'