From e879fcec755b9e3d09732b3a989dcd678d79442d Mon Sep 17 00:00:00 2001
From: Ilya Matveev <ilya.matveev@jetbrains.com>
Date: Mon, 12 Feb 2018 22:22:46 +0700
Subject: [PATCH] [samples] Fix android sample in bundle

---
 build.gradle                                           | 10 ++++++++--
 .../androidNativeActivity/gradle.properties.for_bundle |  1 -
 samples/androidNativeActivity/settings.gradle          |  3 ++-
 3 files changed, 10 insertions(+), 4 deletions(-)
 delete mode 100644 samples/androidNativeActivity/gradle.properties.for_bundle

diff --git a/build.gradle b/build.gradle
index a7ac8a59078..69da559f9d1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -355,18 +355,24 @@ task bundle(type: (isWindows()) ? Zip : Tar) {
         include 'samples/**'
         exclude 'samples/gradle.properties'
         exclude 'samples/settings.gradle'
+        exclude 'samples/androidNativeActivity/settings.gradle'
+        exclude 'samples/androidNativeActivity/gradle.properties'
         exclude '**/build'
         exclude '**/.gradle'
         exclude 'samples/**/*.kt.bc-build'
         into baseName
     }
 
-    from(project.file("samples/settings.gradle")) {
+    from(project.file("samples")) {
+        include 'settings.gradle'
+        include 'androidNativeActivity/settings.gradle'
         into "$baseName/samples"
         filter { it.startsWith("includeBuild") ? null : it }
     }
 
-    from(project.file("samples/gradle.properties")) {
+    from(project.file("samples")) {
+        include 'gradle.properties'
+        include 'androidNativeActivity/gradle.properties'
         into "$baseName/samples"
         filter { it.startsWith("konan.home=") ? "konan.home=../.." : it }
     }
diff --git a/samples/androidNativeActivity/gradle.properties.for_bundle b/samples/androidNativeActivity/gradle.properties.for_bundle
deleted file mode 100644
index 5e41860b04f..00000000000
--- a/samples/androidNativeActivity/gradle.properties.for_bundle
+++ /dev/null
@@ -1 +0,0 @@
-konan.home=../..
diff --git a/samples/androidNativeActivity/settings.gradle b/samples/androidNativeActivity/settings.gradle
index 5842b801908..5235398bace 100644
--- a/samples/androidNativeActivity/settings.gradle
+++ b/samples/androidNativeActivity/settings.gradle
@@ -1 +1,2 @@
-//includeBuild '../../'
+includeBuild '../../shared'
+includeBuild '../../tools/kotlin-native-gradle-plugin'