diff --git a/ndk/build/core/build-binary.mk b/ndk/build/core/build-binary.mk
index 6254302cf..f5ebdcb44 100644
--- a/ndk/build/core/build-binary.mk
+++ b/ndk/build/core/build-binary.mk
@@ -120,5 +120,5 @@ $(foreach src,$(c_sources),   $(call compile-c-source,$(src)))
 $(foreach src,$(s_sources),   $(call compile-s-source,$(src)))
 $(foreach src,$(cpp_sources), $(call compile-cpp-source,$(src)))
 
-LOCAL_DEPENDENCY_DIRS := $(sort $(LOCAL_DEPENDENCY_DIRS))
-CLEAN_OBJS_DIRS       += $(LOCAL_OBJS_DIR)
+ALL_DEPENDENCY_DIRS += $(sort $(LOCAL_DEPENDENCY_DIRS))
+CLEAN_OBJS_DIRS     += $(LOCAL_OBJS_DIR)
diff --git a/ndk/build/core/main.mk b/ndk/build/core/main.mk
index 7f67fb069..a07e3b3c7 100644
--- a/ndk/build/core/main.mk
+++ b/ndk/build/core/main.mk
@@ -222,7 +222,7 @@ ANDROID_MK_INCLUDED := \
 # generated during the build. It will be updated by build scripts
 # when module definitions are parsed.
 #
-DEPENDENCY_DIRS :=
+ALL_DEPENDENCY_DIRS :=
 
 # this is the list of all generated files that we would need to clean
 ALL_HOST_EXECUTABLES      :=
@@ -290,5 +290,5 @@ clean-config:
 	$(hide) rm -f $(CONFIG_MAKE) $(CONFIG_H)
 
 # include dependency information
-DEPENDENCY_DIRS := $(sort $(DEPENDENCY_DIRS))
--include $(wildcard $(DEPENDENCY_DIRS:%=%/*.d))
+ALL_DEPENDENCY_DIRS := $(sort $(ALL_DEPENDENCY_DIRS))
+-include $(wildcard $(ALL_DEPENDENCY_DIRS:%=%/*.d))
diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java
index d3e3f44a4..0ac3bb9b3 100644
--- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java
+++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java
@@ -1122,22 +1122,6 @@ public class AdtPlugin extends AbstractUIPlugin {
                 "/icons/android.png"); //$NON-NLS-1$
         sAndroidLogo = sAndroidLogoDesc.createImage();
 
-        // get the stream to write in the android console.
-        MessageConsole androidConsole = AdtPlugin.getDefault().getAndroidConsole();
-        mAndroidConsoleStream = androidConsole.newMessageStream();
-
-        mAndroidConsoleErrorStream = androidConsole.newMessageStream();
-        mRed = new Color(getDisplay(), 0xFF, 0x00, 0x00);
-
-        // because this can be run, in some cases, by a non ui thread, and beccause
-        // changing the console properties update the ui, we need to make this change
-        // in the ui thread.
-        getDisplay().asyncExec(new Runnable() {
-            public void run() {
-                mAndroidConsoleErrorStream.setColor(mRed);
-            }
-        });
-
         // Add a resource listener to handle compiled resources.
         IWorkspace ws = ResourcesPlugin.getWorkspace();
         mResourceMonitor = ResourceMonitor.startMonitoring(ws);