From ac9a1350c2cfac948b127519c86eb8ccfb0cd439 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Tue, 8 Dec 2015 18:05:44 +0300
Subject: [PATCH] Application package from manifest file has a higher priority
 than the applicationId value in build.gradle (KT-10320)

---
 .../org/jetbrains/kotlin/android/AndroidSubplugin.kt       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libraries/tools/kotlin-android-extensions/src/main/kotlin/org/jetbrains/kotlin/android/AndroidSubplugin.kt b/libraries/tools/kotlin-android-extensions/src/main/kotlin/org/jetbrains/kotlin/android/AndroidSubplugin.kt
index 759bb7939bd..3d925158ca7 100644
--- a/libraries/tools/kotlin-android-extensions/src/main/kotlin/org/jetbrains/kotlin/android/AndroidSubplugin.kt
+++ b/libraries/tools/kotlin-android-extensions/src/main/kotlin/org/jetbrains/kotlin/android/AndroidSubplugin.kt
@@ -38,8 +38,11 @@ public class AndroidSubplugin : KotlinGradleSubplugin {
 
         val mainSourceSet = sourceSets.getByName("main")
         val manifestFile = mainSourceSet.manifest.srcFile
-        val applicationPackage = androidExtension.defaultConfig.applicationId
-                ?: getApplicationPackageFromManifest(manifestFile) ?: ""
+        val applicationPackage = getApplicationPackageFromManifest(manifestFile) ?: run {
+            project.logger.warn(
+                    "Application package name is not present in the manifest file (${manifestFile.absolutePath})")
+            ""
+        }
         pluginOptions += SubpluginOption("package", applicationPackage)
 
         fun addVariant(sourceSet: AndroidSourceSet) {