LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am c15ed2d: Fix a double issue regarding interrupted builds due to pre-e

Browse Source 
Merge commit 'c15ed2d771b4b02bab5f2a2281d08a050ee1df89'

* commit 'c15ed2d771b4b02bab5f2a2281d08a050ee1df89':
  Fix a double issue regarding interrupted builds due to pre-existing errors.
This commit is contained in:
Xavier Ducrohet
2009-05-14 11:36:50 -07:00
committed by The Android Open Source Project
parent 1e074599b5 c15ed2d771
commit 4dca12b57e
2 changed files with 147 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/ApkBuilder.java
View File

@@ -570,7 +570,7 @@ public class ApkBuilder extends BaseBuilder {
// first check if this is a CoreException we threw to cancel the build.
if (exception instanceof CoreException) {
if (((CoreException)exception).getStatus().getCode() == IStatus.CANCEL) {
if (((CoreException)exception).getStatus().getSeverity() == IStatus.CANCEL) {
// Project is already marked with an error. Nothing to do
return referencedProjects;
}
@@ -1198,4 +1198,17 @@ public class ApkBuilder extends BaseBuilder {
String name = folder.getName();
return JavaResourceFilter.checkFolderForPackaging(name);
}
@Override
protected void abortOnBadSetup(IProject project) throws CoreException {
super.abortOnBadSetup(project);
// for this version, we stop on any marker (ie also markers coming from JDT)
IMarker[] markers = project.findMarkers(null /*type*/, false /*includeSubtypes*/,
IResource.DEPTH_ZERO);
if (markers.length > 0) {
stopBuild("");
}
}
}

2
tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/BaseBuilder.java
View File

@@ -886,7 +886,7 @@ abstract class BaseBuilder extends IncrementalProjectBuilder {
* @param project The {@link IJavaProject} being compiled.
* @throws CoreException
*/
protected final void abortOnBadSetup(IProject project) throws CoreException {
protected void abortOnBadSetup(IProject project) throws CoreException {
// check if we have finished loading the SDK.
if (AdtPlugin.getDefault().getSdkLoadStatus() != LoadStatus.LOADED) {
// we exit silently