MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Revert "IDEA-60449 running junit tests in a module with an Android facet should not perform a full Android build"

Browse Source 
This reverts commit 412ec6ef3e.
This commit is contained in:
Eugene Kudelevsky
2011-03-09 14:38:17 +03:00
parent 412ec6ef3e
commit 85eafcaa50
4 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android/src/org/jetbrains/android/compiler/AndroidCompileUtil.java
-8
View File
@@ -18,10 +18,7 @@ package org.jetbrains.android.compiler;
import com.intellij.CommonBundle;
import com.intellij.compiler.impl.CompileContextImpl;
import com.intellij.compiler.impl.ModuleCompileScope;
import com.intellij.compiler.options.CompileStepBeforeRun;
import com.intellij.compiler.progress.CompilerTask;
import com.intellij.execution.configurations.RunConfiguration;
import com.intellij.execution.junit.JUnitConfiguration;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.compiler.CompileContext;
@@ -359,9 +356,4 @@ public class AndroidCompileUtil {
}
return ArrayUtil.toStringArray(result);
}
public static boolean isFullBuild(@NotNull CompileContext context) {
RunConfiguration runConfiguration = CompileStepBeforeRun.getRunConfiguration(context);
return !(runConfiguration instanceof JUnitConfiguration);
}
}
plugins/android/src/org/jetbrains/android/compiler/AndroidDexCompiler.java
-4
View File
@@ -75,10 +75,6 @@ public class AndroidDexCompiler implements ClassPostProcessingCompiler {
@NotNull
public ProcessingItem[] getProcessingItems(CompileContext context) {
if (!AndroidCompileUtil.isFullBuild(context)) {
return ProcessingItem.EMPTY_ARRAY;
}
return ApplicationManager.getApplication().runReadAction(new PrepareAction(context));
}
plugins/android/src/org/jetbrains/android/compiler/AndroidPackagingCompiler.java
-4
View File
@@ -94,10 +94,6 @@ public class AndroidPackagingCompiler implements PackagingCompiler {
@NotNull
public ProcessingItem[] getProcessingItems(CompileContext context) {
if (!AndroidCompileUtil.isFullBuild(context)) {
return ProcessingItem.EMPTY_ARRAY;
}
final List<ProcessingItem> items = new ArrayList<ProcessingItem>();
for (Module module : ModuleManager.getInstance(context.getProject()).getModules()) {
AndroidFacet facet = AndroidFacet.getInstance(module);
plugins/android/src/org/jetbrains/android/compiler/AndroidResourcesPackagingCompiler.java
-4
View File
@@ -42,10 +42,6 @@ public class AndroidResourcesPackagingCompiler implements ClassPostProcessingCom
@NotNull
@Override
public ProcessingItem[] getProcessingItems(CompileContext context) {
if (!AndroidCompileUtil.isFullBuild(context)) {
return ProcessingItem.EMPTY_ARRAY;
}
final List<ProcessingItem> items = new ArrayList<ProcessingItem>();
for (Module module : ModuleManager.getInstance(context.getProject()).getModules()) {
AndroidFacet facet = AndroidFacet.getInstance(module);