From c39a26b6f52d189a0bec85cbe168006454b14a9b Mon Sep 17 00:00:00 2001
From: David 'Digit' Turner <digit@google.com>
Date: Thu, 14 May 2009 17:16:32 +0200
Subject: [PATCH] Fix bad automatic dependency computations

---
 ndk/build/core/build-binary.mk | 4 ++--
 ndk/build/core/main.mk         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

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))