aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2011-12-05 13:53:59 -0800
committerXavier Ducrohet <xav@android.com>2011-12-05 13:53:59 -0800
commita8769e688a08a14f99b47c351dcb907eaca07ca4 (patch)
tree527624b20304c21805d5036315d8e71844043dfe
parent3f69598ca49f1672c6a1fd311fb4e3bac245512a (diff)
downloadsdk-a8769e688a08a14f99b47c351dcb907eaca07ca4.zip
sdk-a8769e688a08a14f99b47c351dcb907eaca07ca4.tar.gz
sdk-a8769e688a08a14f99b47c351dcb907eaca07ca4.tar.bz2
Update calls to IResource.setDerived.
The version with only a boolean is deprecated in 3.6+ Change-Id: I22061e53f84af674fa137d96cfb2799a0f97faad
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java
index 491b764..e50e3eb 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java
@@ -53,6 +53,7 @@ import org.eclipse.core.resources.IResourceDelta;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
@@ -160,7 +161,7 @@ public class PreCompilerBuilder extends BaseBuilder {
}
try {
- member.setDerived(true);
+ member.setDerived(true, new NullProgressMonitor());
} catch (CoreException e) {
// This really shouldn't happen since we check that the resource
// exist.
@@ -587,7 +588,7 @@ public class PreCompilerBuilder extends BaseBuilder {
if (mGenFolder != null) {
// gen folder should not be derived, but previous version could set it to derived
// so we make sure this isn't the case (or it'll get deleted by the clean)
- mGenFolder.setDerived(false);
+ mGenFolder.setDerived(false, monitor);
removeDerivedResources(mGenFolder, monitor);
}