From 7ec528c5b038fcc3f78be1771672933dcdb7507a Mon Sep 17 00:00:00 2001
From: David 'Digit' Turner <digit@google.com>
Date: Wed, 22 Jul 2009 13:34:54 +0200
Subject: [PATCH] Ensure LOCAL_LDLIBS is cleared by the $(CLEAR_VARS) script

---
 ndk/build/core/clear-vars.mk | 1 +
 ndk/docs/CHANGES.TXT         | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ndk/build/core/clear-vars.mk b/ndk/build/core/clear-vars.mk
index 435247465..74cce2f36 100644
--- a/ndk/build/core/clear-vars.mk
+++ b/ndk/build/core/clear-vars.mk
@@ -24,6 +24,7 @@ NDK_LOCAL_VARS := \
   LOCAL_CXXFLAGS \
   LOCAL_CPPFLAGS \
   LOCAL_LDFLAGS \
+  LOCAL_LDLIBS \
   LOCAL_ARFLAGS \
   LOCAL_CPP_EXTENSION \
   LOCAL_STATIC_LIBRARIES \
diff --git a/ndk/docs/CHANGES.TXT b/ndk/docs/CHANGES.TXT
index 8f30f1fe5..b2804d8ae 100644
--- a/ndk/docs/CHANGES.TXT
+++ b/ndk/docs/CHANGES.TXT
@@ -17,7 +17,8 @@ current version
      LOCAL_LDLIBS := -lz
 
   Actually work correctly, instead of having the linker complaining that it
-  could not find the corresponding libz.so library.
+  could not find the corresponding libz.so library. Also clear LOCAL_LDLIBS
+  in $(CLEAR_VARS) script.
 
 - Generate thumb binaries by default.