Begin moving AndroidModuleModel to project-system-gradle (Step 1)

Step 1:
  - Move `AndroidModuleModel` implementation to a new class named
    `GradleAndroidModule` and update all references in
    `project-system-gradle` module to use the implementation class
    directly.

  - Convert `AndroidModuleModel` to an interface and leave there methods
    which are used in `android.core` and other modules which are not
    part of the Gradle project system (with some exceptions which we
    will need to address later).

Bug: 147586218
Test: n/a
Change-Id: Ie37e4ab73ba9b249320b440289d3197d3929d727

1 files changed, 6 insertions, 6 deletions

diff --git a/android-lint/src/com/android/tools/idea/lint/AndroidLintIdeProject.java b/android-lint/src/com/android/tools/idea/lint/AndroidLintIdeProject.java
index 5881d7b370d..29497b8fb79 100644
--- a/android-lint/src/com/android/tools/idea/lint/AndroidLintIdeProject.java
+++ b/android-lint/src/com/android/tools/idea/lint/AndroidLintIdeProject.java
@@ -23,7 +23,7 @@ import com.android.sdklib.AndroidTargetHash;
 import com.android.sdklib.AndroidVersion;
 import com.android.support.AndroidxNameUtils;
 import com.android.tools.idea.gradle.model.IdeAndroidProject;
-import com.android.tools.idea.gradle.project.model.AndroidModuleModel;
+import com.android.tools.idea.gradle.project.model.GradleAndroidModel;
 import com.android.tools.idea.lint.common.LintIdeClient;
 import com.android.tools.idea.lint.common.LintIdeProject;
 import com.android.tools.idea.lint.model.LintModelFactory;
@@ -310,8 +310,8 @@ public class AndroidLintIdeProject extends LintIdeProject {
     }
     else if (AndroidModel.isRequired(facet)) {
       AndroidModel androidModel = AndroidModel.get(facet);
-      if (androidModel instanceof AndroidModuleModel) {
-        AndroidModuleModel model = (AndroidModuleModel)androidModel;
+      if (androidModel instanceof GradleAndroidModel) {
+        GradleAndroidModel model = (GradleAndroidModel)androidModel;
         String variantName = model.getSelectedVariantName();
 
         LintModelModule lintModel = getLintModuleModel(model, dir, shallowModel);
@@ -337,7 +337,7 @@ public class AndroidLintIdeProject extends LintIdeProject {
   }
 
   @NotNull
-  private static LintModelModule getLintModuleModel(@NotNull AndroidModuleModel model, File dir, boolean shallowModel) {
+  private static LintModelModule getLintModuleModel(@NotNull GradleAndroidModel model, File dir, boolean shallowModel) {
     IdeAndroidProject builderModelProject = model.getAndroidProject();
     if (model.lintModuleModelCache != null) {
       return (LintModelModule)model.lintModuleModelCache;
@@ -604,7 +604,7 @@ public class AndroidLintIdeProject extends LintIdeProject {
   }
 
   private static class LintGradleProject extends LintModelModuleProject {
-    private final AndroidModuleModel myAndroidModuleModel;
+    private final GradleAndroidModel myAndroidModuleModel;
     private final AndroidFacet myFacet;
 
     /**
@@ -616,7 +616,7 @@ public class AndroidLintIdeProject extends LintIdeProject {
       @NonNull File referenceDir,
       @NonNull LintModelVariant variant,
       @NonNull AndroidFacet facet,
-      @NonNull AndroidModuleModel androidModuleModel) {
+      @NonNull GradleAndroidModel androidModuleModel) {
       super(client, dir, referenceDir, variant, null);
       gradleProject = true;
       mergeManifests = true;