From 41d9477870fc970141460e3f6e748f9b191df6e3 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Thu, 26 Feb 2015 19:33:42 +0300 Subject: [PATCH] Load Android extensions only if plugin options are present --- .../src/AndroidComponentRegistrar.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/plugins/android-compiler-plugin/src/AndroidComponentRegistrar.kt b/plugins/android-compiler-plugin/src/AndroidComponentRegistrar.kt index 7295b695582..5098b04e0e1 100644 --- a/plugins/android-compiler-plugin/src/AndroidComponentRegistrar.kt +++ b/plugins/android-compiler-plugin/src/AndroidComponentRegistrar.kt @@ -238,9 +238,12 @@ public class AndroidComponentRegistrar : ComponentRegistrar { public override fun registerProjectComponents(project: MockProject, configuration: CompilerConfiguration) { val androidResPath = configuration.get(AndroidConfigurationKeys.ANDROID_RES_PATH) val androidManifest = configuration.get(AndroidConfigurationKeys.ANDROID_MANIFEST) - project.registerService(javaClass(), CliAndroidUIXmlProcessor(project, androidManifest, androidResPath)) - ExternalDeclarationsProvider.registerExtension(project, CliAndroidDeclarationsProvider(project)) - ExpressionCodegenExtension.registerExtension(project, AndroidExpressionCodegen()) + if (androidResPath != null && androidManifest != null) { + project.registerService(javaClass(), CliAndroidUIXmlProcessor(project, androidManifest, androidResPath)) + + ExternalDeclarationsProvider.registerExtension(project, CliAndroidDeclarationsProvider(project)) + ExpressionCodegenExtension.registerExtension(project, AndroidExpressionCodegen()) + } } } \ No newline at end of file