From 6cc9ca211f95900c33362c05460c1b98926bdf33 Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Wed, 18 Oct 2017 12:50:59 +0300 Subject: [PATCH] samples: Fix android sample after gradle plugin rework --- samples/androidNativeActivity/build.gradle | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/samples/androidNativeActivity/build.gradle b/samples/androidNativeActivity/build.gradle index e7009705172..eb3c5e20d5d 100644 --- a/samples/androidNativeActivity/build.gradle +++ b/samples/androidNativeActivity/build.gradle @@ -25,18 +25,16 @@ allprojects { apply plugin: "konan" +def platforms = ["armeabi-v7a", "arm64-v8a"] konanTargets = ["android_arm32", "android_arm64"] konanArtifacts { - Polyhedron { + program('Polyhedron') { baseDir 'Polyhedron' outputName 'libpoly' } } -def platforms = ["armeabi-v7a", "arm64-v8a"] -def artifacts = ["Polyhedron/armeabi-v7a", "Polyhedron/arm64-v8a"] - apply plugin: "com.android.model.application" model { @@ -70,7 +68,7 @@ model { def name = targetPlatform.getName() def index = platforms.indexOf(name) if (index >= 0) - sharedLibraryFile = file("${artifacts[index]}/libpoly.so") + sharedLibraryFile = konanArtifacts.Polyhedron."${konanTargets[index]}".artifact } } }