From a818be128171ddc9d4d979f9cbbdd8735026093a Mon Sep 17 00:00:00 2001
From: Svyatoslav Scherbina <svyatoslav.scherbina@jetbrains.com>
Date: Wed, 31 Jan 2018 17:23:20 +0300
Subject: [PATCH] Disable composite build for calculator androidApp

to workaround a bug in Android Studio. Details:
https://github.com/JetBrains/kotlin-native/pull/1277#issuecomment-361924978

Include parser library sources directly to the project
---
 samples/calculator/androidApp/build.gradle    | 3 ++-
 samples/calculator/androidApp/settings.gradle | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/samples/calculator/androidApp/build.gradle b/samples/calculator/androidApp/build.gradle
index 6fd773b2a2f..5b631b4480c 100644
--- a/samples/calculator/androidApp/build.gradle
+++ b/samples/calculator/androidApp/build.gradle
@@ -27,6 +27,7 @@ android {
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
+        main.java.srcDirs += '../parser/src/main/kotlin'
     }
 }
 
@@ -37,7 +38,7 @@ repositories {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation "org.jetbrains.kotlin.konan.samples:arithmetic-parser"
+//    implementation "org.jetbrains.kotlin.konan.samples:arithmetic-parser"
 
     implementation "com.android.support:appcompat-v7:27.0.2"
 }
diff --git a/samples/calculator/androidApp/settings.gradle b/samples/calculator/androidApp/settings.gradle
index b1ad6b6bedf..a557968a286 100644
--- a/samples/calculator/androidApp/settings.gradle
+++ b/samples/calculator/androidApp/settings.gradle
@@ -1 +1 @@
-includeBuild '../parser'
+// includeBuild '../parser'