Fix issue with generation of R classes for libraries.

When a clean action happen, the order of compilation of
the project isn't dictated by the dependencies between the
project. It is therefore important to detect changed in R.txt
for each library and recompile the project when that happens.

Also fixed a potential NPE when building libraries!

Change-Id: I6a87e9c3a4984e5aa6401270cf83eaea74044c9f

1 files changed, 5 insertions, 3 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/BuildHelper.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/BuildHelper.java
index 5fb66605f..2ad8a093c 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/BuildHelper.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/BuildHelper.java
@@ -17,6 +17,7 @@
 package com.android.ide.eclipse.adt.internal.build;
 
 import com.android.SdkConstants;
+import com.android.annotations.NonNull;
 import com.android.annotations.Nullable;
 import com.android.ide.eclipse.adt.AdtConstants;
 import com.android.ide.eclipse.adt.AdtPlugin;
@@ -132,9 +133,10 @@ public class BuildHelper {
      * @param verbose
      * @throws CoreException
      */
-    public BuildHelper(IProject project, AndroidPrintStream outStream,
-            AndroidPrintStream errStream, boolean debugMode, boolean verbose,
-            ResourceMarker resMarker) throws CoreException {
+    public BuildHelper(@NonNull IProject project,
+            @NonNull AndroidPrintStream outStream,
+            @NonNull AndroidPrintStream errStream,
+            boolean debugMode, boolean verbose, ResourceMarker resMarker) throws CoreException {
         mProject = project;
         mOutStream = outStream;
         mErrStream = errStream;