From 9d24211d3a3ce3f67cf8afb92f6c2ee2ac273919 Mon Sep 17 00:00:00 2001
From: Bradley Smith <smithbradley@google.com>
Date: Mon, 11 Mar 2019 09:29:01 +0300
Subject: [PATCH] Ensure GradleProjectResolver uses the provided extra model 
 provider given by extensions

---
 .../plugins/gradle/service/project/GradleProjectResolver.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java
index 06a9c8680354..2ea6d6c43f84 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java
@@ -227,8 +227,7 @@ public class GradleProjectResolver implements ExternalSystemProjectResolver<Grad
       if(!resolverCtx.isPreviewMode()){
         // register classes of extra gradle project models required for extensions (e.g. com.android.builder.model.AndroidProject)
         try {
-          projectImportAction.addProjectImportExtraModelProvider(
-            new ClassSetProjectImportExtraModelProvider(resolverExtension.getExtraProjectModelClasses()));
+          projectImportAction.addProjectImportExtraModelProvider(resolverExtension.getExtraModelProvider());
         }
         catch (Throwable t) {
           LOG.warn(t);