diff options
| author | Michal Bendowski <bendowski@google.com> | 2015-08-03 09:47:52 +0100 |
|---|---|---|
| committer | Michal Bendowski <bendowski@google.com> | 2015-08-03 09:47:52 +0100 |
| commit | 7351fccad4bd3a5bd0602db0818492a5bccd1dde (patch) | |
| tree | 2f4a3e87306ef215c2d88c219a47aef090450b70 /android/src | |
| parent | f9a37740b48c714df09b1c9539a0ca9d4e43b308 (diff) | |
| parent | eaefb404536d81e66b5c14884851932a5c46117b (diff) | |
| download | idea-7351fccad4bd3a5bd0602db0818492a5bccd1dde.tar.gz | |
resolve merge conflicts of eaefb40 to studio-1.4-dev.
Change-Id: I9c661884ff730e271b33d6678f34559546456fee
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/com/android/tools/idea/gradle/AndroidJunitPatcher.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/android/src/com/android/tools/idea/gradle/AndroidJunitPatcher.java b/android/src/com/android/tools/idea/gradle/AndroidJunitPatcher.java index 4908b48982e..c961ae76a63 100644 --- a/android/src/com/android/tools/idea/gradle/AndroidJunitPatcher.java +++ b/android/src/com/android/tools/idea/gradle/AndroidJunitPatcher.java @@ -19,7 +19,6 @@ import com.android.builder.model.AndroidProject; import com.android.builder.model.BaseArtifact; import com.android.builder.model.JavaArtifact; import com.android.sdklib.IAndroidTarget; -import com.google.common.base.Joiner; import com.intellij.execution.JUnitPatcher; import com.intellij.execution.configurations.JavaParameters; import com.intellij.openapi.compiler.CompileScope; @@ -133,9 +132,6 @@ public class AndroidJunitPatcher extends JUnitPatcher { return; } } - - throw new IllegalStateException(String.format("Could not find matching mockable platform jar. Mockable jars found: [%s].", - Joiner.on(',').join(mockableJars))); } } |