From e40ac063c88f3e3e95c750b27028b841881011a5 Mon Sep 17 00:00:00 2001 From: Mike Sinkovsky Date: Fri, 27 Sep 2019 21:57:43 +0500 Subject: [PATCH] Add "x86" and "x86_64" targets to samples/androidNativeActivity (#3385) --- samples/androidNativeActivity/build.gradle.kts | 10 ++++++++-- samples/androidNativeActivity/gradle.properties | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/samples/androidNativeActivity/build.gradle.kts b/samples/androidNativeActivity/build.gradle.kts index 29a93da5434..c32dd854660 100644 --- a/samples/androidNativeActivity/build.gradle.kts +++ b/samples/androidNativeActivity/build.gradle.kts @@ -20,7 +20,9 @@ val libsDir = appDir.resolve("libs") val androidPresets = mapOf( "arm32" to ("androidNativeArm32" to "$libsDir/armeabi-v7a"), - "arm64" to ("androidNativeArm64" to "$libsDir/arm64-v8a") + "arm64" to ("androidNativeArm64" to "$libsDir/arm64-v8a"), + "x86" to ("androidNativeX86" to "$libsDir/x86"), + "x64" to ("androidNativeX64" to "$libsDir/x86_64") ) android { @@ -32,7 +34,7 @@ android { targetSdkVersion(28) ndk { - abiFilters("armeabi-v7a", "arm64-v8a") + abiFilters("armeabi-v7a", "arm64-v8a", "x86", "x86_64") } } @@ -63,7 +65,11 @@ kotlin { sourceSets { val arm32Main by getting val arm64Main by getting + val x86Main by getting + val x64Main by getting arm64Main.dependsOn(arm32Main) + x86Main.dependsOn(arm32Main) + x64Main.dependsOn(arm32Main) } } diff --git a/samples/androidNativeActivity/gradle.properties b/samples/androidNativeActivity/gradle.properties index 8bbb7d6ad0e..3f2e3744514 100644 --- a/samples/androidNativeActivity/gradle.properties +++ b/samples/androidNativeActivity/gradle.properties @@ -6,7 +6,7 @@ org.gradle.workers.max=4 # Pin Kotlin version: # CHANGE_VERSION_WITH_RELEASE -kotlin_version=1.3.50 +kotlin_version=1.3.60-dev-2573 # Use custom Kotlin/Native home: org.jetbrains.kotlin.native.home=../../dist