Never abandon a build before recording the resource delta.

Change-Id: Idf55cd31705b9c122577c3aeabdb09bbe373b963

1 files changed, 4 insertions, 3 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PostCompilerBuilder.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PostCompilerBuilder.java
index a2a5346..244dd01 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PostCompilerBuilder.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PostCompilerBuilder.java
@@ -298,9 +298,6 @@ public class PostCompilerBuilder extends BaseBuilder {
             refList.addAll(javaProjects);
             allRefProjects = refList.toArray(new IProject[size]);
 
-            // Top level check to make sure the build can move forward.
-            abortOnBadSetup(javaProject);
-
             // get the android output folder
             IFolder androidOutputFolder = BaseProjectHelper.getAndroidOutputFolder(project);
             IFolder resOutputFolder = androidOutputFolder.getFolder(SdkConstants.FD_RES);
@@ -396,6 +393,10 @@ public class PostCompilerBuilder extends BaseBuilder {
             saveProjectBooleanProperty(PROPERTY_PACKAGE_RESOURCES, mPackageResources);
             saveProjectBooleanProperty(PROPERTY_BUILD_APK, mBuildFinalPackage);
 
+            // Top level check to make sure the build can move forward. Only do this after recording
+            // delta changes.
+            abortOnBadSetup(javaProject);
+
             if (dv != null && dv.mXmlError) {
                 AdtPlugin.printBuildToConsole(BuildVerbosity.VERBOSE, project,
                 Messages.Xml_Error);