From ee391191eda22d882522c53e7ad5f27d6fa4a5c4 Mon Sep 17 00:00:00 2001
From: LepilkinaElena <Elena.Lepilkina@jetbrains.com>
Date: Fri, 11 Oct 2019 13:25:41 +0300
Subject: [PATCH] Fix bundle build (#3455)

---
 build.gradle                                      | 11 ++++++-----
 platformLibs/src/platform/ios/ARDisplayDevice.def |  7 -------
 2 files changed, 6 insertions(+), 12 deletions(-)
 delete mode 100644 platformLibs/src/platform/ios/ARDisplayDevice.def

diff --git a/build.gradle b/build.gradle
index 1ec1fd766f6..d4c2a07f7d6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -226,11 +226,11 @@ task distSources {
     dependsOn(distEndorsedSources)
 }
 
-def jarContent(def jarTask, FileTree baseFileTree) {
+def jarContent(def jarTask, FileTree baseFileTree, Iterable<String> excludedList = []) {
     jarTask.from {
         baseFileTree
                 .matching { include("*.jar") }
-                .collect { zipTree("${it.absolutePath}") }
+                .collect { zipTree("${it.absolutePath}").matching { exclude(excludedList) } }
     }
 }
 
@@ -243,13 +243,14 @@ task mergeJars(type: Jar) {
 
     archiveFileName = 'kotlin-native.jar'
     destinationDirectory = file("$distDir/konan/lib")
-
+    
+    jarContent(it, project(':backend.native').fileTree('build/external_jars'),
+            ['META-INF/services/org.jetbrains.kotlin.resolve.ExternalOverridabilityCondition'])
     jarContent(it, project(':backend.native').fileTree('build/libs'))
+    jarContent(it, project(':utilities').fileTree('build/libs'))
     jarContent(it, project('Interop').fileTree('Runtime/build/libs'))
     jarContent(it, project('Interop').fileTree('Indexer/build/libs'))
     jarContent(it, project('Interop').fileTree('StubGenerator/build/libs'))
-    jarContent(it, project(':backend.native').fileTree('build/external_jars'))
-    jarContent(it, project(':utilities').fileTree('build/libs'))
 
     jarContent(it, project(':klib').fileTree('build/libs'))
     jarContent(it, project(':endorsedLibraries:kotlinx.cli').fileTree('build/libs'))
diff --git a/platformLibs/src/platform/ios/ARDisplayDevice.def b/platformLibs/src/platform/ios/ARDisplayDevice.def
deleted file mode 100644
index 50a523929b0..00000000000
--- a/platformLibs/src/platform/ios/ARDisplayDevice.def
+++ /dev/null
@@ -1,7 +0,0 @@
-depends = CFNetwork CoreFoundation Foundation Security darwin posix
-language = Objective-C
-package = platform.ARDisplayDevice
-modules = ARDisplayDevice
-
-compilerOpts = -framework ARDisplayDevice
-linkerOpts = -framework ARDisplayDevice