From: David 'Digit' Turner <digit@google.com>
Date: Wed, 22 Jul 2009 11:34:54 +0000 (+0200)
Subject: Ensure LOCAL_LDLIBS is cleared by the $(CLEAR_VARS) script
X-Git-Tag: android-x86-2.2~640^2~91^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a27aba4c4d3c1cf57c1085d6060426a535a0e8a3;p=android-x86%2Fndk.git

Ensure LOCAL_LDLIBS is cleared by the $(CLEAR_VARS) script
---

diff --git a/build/core/clear-vars.mk b/build/core/clear-vars.mk
index 4352474..74cce2f 100644
--- a/build/core/clear-vars.mk
+++ b/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/docs/CHANGES.TXT b/docs/CHANGES.TXT
index 8f30f1f..b2804d8 100644
--- a/docs/CHANGES.TXT
+++ b/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.