1 files changed, 1 insertions, 23 deletions
diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/variant/ApkVariantData.java b/gradle/src/main/groovy/com/android/build/gradle/internal/variant/ApkVariantData.java
index ef74235..9c1f580 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/internal/variant/ApkVariantData.java
+++ b/gradle/src/main/groovy/com/android/build/gradle/internal/variant/ApkVariantData.java
@@ -44,34 +44,12 @@ public abstract class ApkVariantData extends BaseVariantData {
         if (getVariantConfiguration().hasFlavors()) {
             return String.format("%s build for flavor %s",
                     getCapitalizedBuildTypeName(),
-                    getFlavoredName(true));
+                    getCapitalizedFlavorName());
         } else {
             return String.format("%s build", getCapitalizedBuildTypeName());
         }
     }
 
-    @Override
-    @NonNull
-    public String getDirName() {
-        if (getVariantConfiguration().hasFlavors()) {
-            return String.format("%s/%s",
-                    getFlavoredName(false), getVariantConfiguration().getBuildType().getName());
-        } else {
-            return getVariantConfiguration().getBuildType().getName();
-        }
-    }
-
-    @Override
-    @NonNull
-    public String getBaseName() {
-        if (getVariantConfiguration().hasFlavors()) {
-            return String.format("%s-%s",
-                    getFlavoredName(false), getVariantConfiguration().getBuildType().getName());
-        } else {
-            return getVariantConfiguration().getBuildType().getName();
-        }
-    }
-
     public boolean isSigned() {
         return getVariantConfiguration().isSigningReady();
     }