1 files changed, 6 insertions, 103 deletions
diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/api/ApplicationVariantImpl.java b/gradle/src/main/groovy/com/android/build/gradle/internal/api/ApplicationVariantImpl.java
index ed0afe4..fcc3d0b 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/internal/api/ApplicationVariantImpl.java
+++ b/gradle/src/main/groovy/com/android/build/gradle/internal/api/ApplicationVariantImpl.java
@@ -21,23 +21,13 @@ import com.android.annotations.Nullable;
 import com.android.build.gradle.api.ApplicationVariant;
 import com.android.build.gradle.api.TestVariant;
 import com.android.build.gradle.internal.variant.ApplicationVariantData;
-import com.android.build.gradle.tasks.AidlCompile;
+import com.android.build.gradle.internal.variant.BaseVariantData;
 import com.android.build.gradle.tasks.Dex;
-import com.android.build.gradle.tasks.GenerateBuildConfig;
-import com.android.build.gradle.tasks.MergeAssets;
-import com.android.build.gradle.tasks.MergeResources;
 import com.android.build.gradle.tasks.PackageApplication;
-import com.android.build.gradle.tasks.ProcessAndroidResources;
-import com.android.build.gradle.tasks.ProcessManifest;
-import com.android.build.gradle.tasks.RenderscriptCompile;
 import com.android.build.gradle.tasks.ZipAlign;
-import com.android.builder.DefaultBuildType;
 import com.android.builder.DefaultProductFlavor;
 import com.android.builder.model.SigningConfig;
 import org.gradle.api.DefaultTask;
-import org.gradle.api.Task;
-import org.gradle.api.tasks.Copy;
-import org.gradle.api.tasks.compile.JavaCompile;
 
 import java.io.File;
 import java.util.List;
@@ -46,7 +36,7 @@ import java.util.List;
  * implementation of the {@link ApplicationVariant} interface around an
  * {@link ApplicationVariantData} object.
  */
-public class ApplicationVariantImpl implements ApplicationVariant {
+public class ApplicationVariantImpl extends BaseVariantImpl implements ApplicationVariant {
 
     @NonNull
     private final ApplicationVariantData variantData;
@@ -57,38 +47,13 @@ public class ApplicationVariantImpl implements ApplicationVariant {
         this.variantData = variantData;
     }
 
-    public void setTestVariant(@Nullable TestVariant testVariant) {
-        this.testVariant = testVariant;
-    }
-
-    @Override
-    @NonNull
-    public String getName() {
-        return variantData.getName();
-    }
-
     @Override
-    @NonNull
-    public String getDescription() {
-        return variantData.getDescription();
-    }
-
-    @Override
-    @NonNull
-    public String getDirName() {
-        return variantData.getDirName();
+    protected BaseVariantData getVariantData() {
+        return variantData;
     }
 
-    @Override
-    @NonNull
-    public String getBaseName() {
-        return variantData.getBaseName();
-    }
-
-    @Override
-    @NonNull
-    public DefaultBuildType getBuildType() {
-        return variantData.getVariantConfiguration().getBuildType();
+    public void setTestVariant(@Nullable TestVariant testVariant) {
+        this.testVariant = testVariant;
     }
 
     @Override
@@ -104,12 +69,6 @@ public class ApplicationVariantImpl implements ApplicationVariant {
     }
 
     @Override
-    @NonNull
-    public File getOutputFile() {
-        return variantData.getOutputFile();
-    }
-
-    @Override
     public void setOutputFile(@NonNull File outputFile) {
         if (variantData.zipAlignTask != null) {
             variantData.zipAlignTask.setOutputFile(outputFile);
@@ -125,57 +84,6 @@ public class ApplicationVariantImpl implements ApplicationVariant {
     }
 
     @Override
-    @NonNull
-    public ProcessManifest getProcessManifest() {
-        return variantData.processManifestTask;
-    }
-
-    @Override
-    @NonNull
-    public AidlCompile getAidlCompile() {
-        return variantData.aidlCompileTask;
-    }
-
-    @Override
-    @NonNull
-    public RenderscriptCompile getRenderscriptCompile() {
-        return variantData.renderscriptCompileTask;
-    }
-
-    @Override
-    public MergeResources getMergeResources() {
-        return variantData.mergeResourcesTask;
-    }
-
-    @Override
-    public MergeAssets getMergeAssets() {
-        return variantData.mergeAssetsTask;
-    }
-
-    @Override
-    @NonNull
-    public ProcessAndroidResources getProcessResources() {
-        return variantData.processResourcesTask;
-    }
-
-    @Override
-    public GenerateBuildConfig getGenerateBuildConfig() {
-        return variantData.generateBuildConfigTask;
-    }
-
-    @Override
-    @NonNull
-    public JavaCompile getJavaCompile() {
-        return variantData.javaCompileTask;
-    }
-
-    @Override
-    @NonNull
-    public Copy getProcessJavaResources() {
-        return variantData.processJavaResourcesTask;
-    }
-
-    @Override
     public Dex getDex() {
         return variantData.dexTask;
     }
@@ -191,11 +99,6 @@ public class ApplicationVariantImpl implements ApplicationVariant {
     }
 
     @Override
-    public Task getAssemble() {
-        return variantData.assembleTask;
-    }
-
-    @Override
     public DefaultTask getInstall() {
         return variantData.installTask;
     }