Fix tests.

Change-Id: I2b082c520e3ebe786c560bc77f364531fd3a9e06

2 files changed, 12 insertions, 3 deletions

diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/BuildTypeDsl.groovy b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/BuildTypeDsl.groovy
index ed4f651..6ca387c 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/BuildTypeDsl.groovy
+++ b/gradle/src/main/groovy/com/android/build/gradle/internal/dsl/BuildTypeDsl.groovy
@@ -17,6 +17,7 @@
 package com.android.build.gradle.internal.dsl
 import com.android.annotations.NonNull
 import com.android.annotations.Nullable
+import com.android.annotations.VisibleForTesting
 import com.android.builder.BuilderConstants
 import com.android.builder.DefaultBuildType
 import com.android.builder.NdkConfig
@@ -36,7 +37,7 @@ public class BuildTypeDsl extends DefaultBuildType implements Serializable {
 
     private final NdkConfigDsl ndkConfig
 
-    BuildTypeDsl(@NonNull String name,
+    public BuildTypeDsl(@NonNull String name,
                  @NonNull FileResolver fileResolver,
                  @NonNull Instantiator instantiator) {
         super(name)
@@ -44,6 +45,14 @@ public class BuildTypeDsl extends DefaultBuildType implements Serializable {
         ndkConfig = instantiator.newInstance(NdkConfigDsl.class)
     }
 
+    @VisibleForTesting
+    BuildTypeDsl(@NonNull String name,
+                 @NonNull FileResolver fileResolver) {
+        super(name)
+        this.fileResolver = fileResolver
+        ndkConfig = null
+    }
+
     @Override
     @Nullable
     public NdkConfig getNdkConfig() {
diff --git a/gradle/src/test/groovy/com/android/build/gradle/internal/dsl/BuildTypeDslTest.groovy b/gradle/src/test/groovy/com/android/build/gradle/internal/dsl/BuildTypeDslTest.groovy
index c63b2e9..3744b79 100644
--- a/gradle/src/test/groovy/com/android/build/gradle/internal/dsl/BuildTypeDslTest.groovy
+++ b/gradle/src/test/groovy/com/android/build/gradle/internal/dsl/BuildTypeDslTest.groovy
@@ -74,7 +74,7 @@ public class BuildTypeDslTest extends BaseTest {
         Project project = ProjectBuilder.builder().withProjectDir(
                 new File(testDir, "basic")).build()
 
-        BuildTypeDsl object1 = new BuildTypeDsl("foo", project.fileResolver, project.instantiator)
+        BuildTypeDsl object1 = new BuildTypeDsl("foo", project.fileResolver)
 
         // change every value from their default.
         object1.setDebuggable(true)
@@ -87,7 +87,7 @@ public class BuildTypeDslTest extends BaseTest {
         object1.setSigningConfig(new SigningConfigDsl("blah"))
         object1.setZipAlign(false)
 
-        BuildTypeDsl object2 = new BuildTypeDsl(object1.name, project.fileResolver, project.instantiator)
+        BuildTypeDsl object2 = new BuildTypeDsl(object1.name, project.fileResolver)
         object2.initWith(object1)
 
         assertEquals(object1, object2)